1.1 --- a/vm/src/test/java/org/apidesign/vm4brwsr/ArrayTest.java	Sat Nov 17 17:43:15 2012 +0100
     1.2 +++ b/vm/src/test/java/org/apidesign/vm4brwsr/ArrayTest.java	Sun Nov 25 23:14:58 2012 +0100
     1.3 @@ -29,7 +29,7 @@
     1.4   */
     1.5  public class ArrayTest {
     1.6      @Test public void verifySimpleIntOperation() throws Exception {
     1.7 -            assertExec("CheckTheSum", "org_apidesign_vm4brwsr_Array_simpleI", 
     1.8 +            assertExec("CheckTheSum", Array.class, "simpleI", 
     1.9              Double.valueOf(15)
    1.10          );
    1.11      }
    1.12 @@ -39,13 +39,13 @@
    1.13      }
    1.14      
    1.15      @Test public void verifyOperationsOnArrays() throws Exception {
    1.16 -        assertExec("The sum is 105", "org_apidesign_vm4brwsr_Array_sumD", 
    1.17 +        assertExec("The sum is 105", Array.class, "sumD", 
    1.18              Double.valueOf(105)
    1.19          );
    1.20      }
    1.21      
    1.22      @Test public void doesCopyArrayWork() throws Exception {
    1.23 -        assertExec("Returns 'a'", "org_apidesign_vm4brwsr_Array_copyArrayC", Double.valueOf('a'));
    1.24 +        assertExec("Returns 'a'", Array.class, "copyArrayC", Double.valueOf('a'));
    1.25      }
    1.26      
    1.27      private static CharSequence codeSeq;
    1.28 @@ -59,21 +59,7 @@
    1.29          );
    1.30          codeSeq = sb;
    1.31      }
    1.32 -    private static void assertExec(String msg, String methodName, Object expRes, Object... args) throws Exception {
    1.33 -        Object ret = null;
    1.34 -        try {
    1.35 -            ret = code.invokeFunction(methodName, args);
    1.36 -        } catch (ScriptException ex) {
    1.37 -            fail("Execution failed in\n" + StaticMethodTest.dumpJS(codeSeq), ex);
    1.38 -        } catch (NoSuchMethodException ex) {
    1.39 -            fail("Cannot find method in\n" + StaticMethodTest.dumpJS(codeSeq), ex);
    1.40 -        }
    1.41 -        if (ret == null && expRes == null) {
    1.42 -            return;
    1.43 -        }
    1.44 -        if (expRes.equals(ret)) {
    1.45 -            return;
    1.46 -        }
    1.47 -        assertEquals(ret, expRes, msg + "was: " + ret + "\n" + codeSeq);
    1.48 +    private static void assertExec(String msg, Class clazz, String method, Object expRes, Object... args) throws Exception {
    1.49 +        StaticMethodTest.assertExec(code, codeSeq, msg, clazz, method, expRes, args);
    1.50      }
    1.51  }