inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.0 to HEAD

Browse Source 
12297: Fix mysql config instructions for case sensitive user names - DOC-68
  12298: Merged V2.2 to V3.0
    12257: Fixed ETWOTWO-952: MLText properties not intercepted when calling addAspect and createNode
    12270: Fixed RhinoScriptTest to propogate exceptions for full recording by Junit
    12271: Fixed NPE in ML interceptor when null node properties are passed to createNode
    12282: Merged V2.1 to V2.2
      11616: Fix for ETWOONE-218: Common.js function needs to be changed to support root context
    12287: Merged V2.1 to V2.2
      12229: WCM - disable/hide link validation by defrault (ETWOONE-106, ETWOONE-392)
  12301: Merged V2.2 to V3.0
    12288: Merged V2.1 to V2.2
      12233: Fixed ETWOONE-124: Add the property UUIDBinding to ImporterBootstrap


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12530 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2008-12-22 12:17:00 +00:00
parent eca46db62b
commit 38ba58dede
9 changed files with 284 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
source/java/org/alfresco/repo/jscript/RhinoScriptTest.java
View File

@@ -141,16 +141,11 @@ public class RhinoScriptTest extends TestCase
// try another script eval - this time a function call returning a result
result = cx.evaluateString(scope, "function f(x) {return x+1} f(7)", "TestJS2", 1, null);
assertEquals(8.0, cx.toNumber(result));
}
catch (Throwable err)
{
err.printStackTrace();
fail(err.getMessage());
assertEquals(8.0, Context.toNumber(result));
}
finally
{
cx.exit();
Context.exit();
}
return null;
@@ -186,7 +181,7 @@ public class RhinoScriptTest extends TestCase
// evaluate script that touches the wrapped NodeRef
Object result = cx.evaluateString(scope, "obj = rootref.getId()", "TestJS3", 1, null);
assertEquals(ref1.getId(), cx.toString(result));
assertEquals(ref1.getId(), Context.toString(result));
// wrap a scriptable Alfresco Node object - the Node object is a wrapper like TemplateNode
ScriptNode node1 = new ScriptNode(root, serviceRegistry, scope);
@@ -196,14 +191,9 @@ public class RhinoScriptTest extends TestCase
// evaluate scripts that perform methods on the wrapped Node
result = cx.evaluateString(scope, TESTSCRIPT1, "TestJS4", 1, null);
}
catch (Throwable err)
{
err.printStackTrace();
fail(err.getMessage());
}
finally
{
cx.exit();
Context.exit();
}
return null;
@@ -258,10 +248,8 @@ public class RhinoScriptTest extends TestCase
// test executing a script directly as a String
scriptService.executeScriptString("javascript", TESTSCRIPT1, model);
}
catch (Throwable err)
finally
{
err.printStackTrace();
fail(err.getMessage());
}
return null;
@@ -311,10 +299,8 @@ public class RhinoScriptTest extends TestCase
// ensure aspect has been added via script
assertTrue(nodeService.hasAspect(childRef.getChildRef(), ContentModel.ASPECT_LOCKABLE));
}
catch (Throwable err)
finally
{
err.printStackTrace();
fail(err.getMessage());
}
return null;
@@ -361,10 +347,8 @@ public class RhinoScriptTest extends TestCase
System.out.println("Result from TESTSCRIPT_CLASSPATH3: " + result.toString());
assertTrue((Boolean)result); // we know the result is a boolean
}
catch (Throwable err)
finally
{
err.printStackTrace();
fail(err.getMessage());
}
return null;