1.1 --- a/vm/src/test/java/org/apidesign/vm4brwsr/NumberTest.java	Wed Feb 06 12:46:35 2013 +0100
     1.2 +++ b/vm/src/test/java/org/apidesign/vm4brwsr/NumberTest.java	Mon Feb 11 12:46:43 2013 +0100
     1.3 @@ -17,8 +17,6 @@
     1.4   */
     1.5  package org.apidesign.vm4brwsr;
     1.6  
     1.7 -import javax.script.Invocable;
     1.8 -import javax.script.ScriptException;
     1.9  import static org.testng.Assert.*;
    1.10  import org.testng.annotations.BeforeClass;
    1.11  import org.testng.annotations.Test;
    1.12 @@ -690,22 +688,17 @@
    1.13          );
    1.14      }
    1.15  
    1.16 -    private static CharSequence codeSeq;
    1.17 -    private static Invocable code;
    1.18 +    private static TestVM code;
    1.19  
    1.20      @BeforeClass
    1.21      public void compileTheCode() throws Exception {
    1.22 -        if (codeSeq == null) {
    1.23 -            StringBuilder sb = new StringBuilder();
    1.24 -            code = StaticMethodTest.compileClass(sb, "org/apidesign/vm4brwsr/Numbers");
    1.25 -            codeSeq = sb;
    1.26 -        }
    1.27 +        code = TestVM.compileClass("org/apidesign/vm4brwsr/Numbers");
    1.28      }
    1.29  
    1.30      private static void assertExec(
    1.31          String msg, Class<?> clazz, String method, Object expRes, Object... args) throws Exception
    1.32      {
    1.33 -        Object ret = TestUtils.execCode(code, codeSeq, msg, clazz, method, expRes, args);
    1.34 +        Object ret = code.execCode(msg, clazz, method, expRes, args);
    1.35          if (ret == null) {
    1.36              return;
    1.37          }
    1.38 @@ -713,10 +706,10 @@
    1.39              double expD = ((Double)expRes).doubleValue();
    1.40              double retD = ((Double)ret).doubleValue();
    1.41              assertEquals(retD, expD, 0.000004, msg + " "
    1.42 -                    + StaticMethodTest.dumpJS(codeSeq));
    1.43 +                    + code.toString());
    1.44              return;
    1.45          }
    1.46 -        assertEquals(ret, expRes, msg + " " + StaticMethodTest.dumpJS(codeSeq));
    1.47 +        assertEquals(ret, expRes, msg + " " + code.toString());
    1.48      }
    1.49      
    1.50  }