Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/jscript/ScriptTestUtils.java

@@ -133,6 +133,19 @@ public class ScriptTestUtils extends BaseScopableProcessorExtension
         }
     }
     
+    public void assertContains(String value, String subString)
+    {
+        assertContains(value, subString, null);
+    }
+    
+    public void assertContains(String value, String subString, String message)
+    {
+        if ( !value.contains(subString))
+        {
+            throw new AlfrescoRuntimeException(message);
+        }
+    }
+    
     public void fail(String message)
     {
         throw new AlfrescoRuntimeException(message);