diff -r 7ffb635a5c4f -r 59d5596a9c6c vm/src/test/java/org/apidesign/vm4brwsr/NumberTest.java --- a/vm/src/test/java/org/apidesign/vm4brwsr/NumberTest.java Wed Feb 06 12:46:35 2013 +0100 +++ b/vm/src/test/java/org/apidesign/vm4brwsr/NumberTest.java Mon Feb 11 12:46:43 2013 +0100 @@ -17,8 +17,6 @@ */ package org.apidesign.vm4brwsr; -import javax.script.Invocable; -import javax.script.ScriptException; import static org.testng.Assert.*; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -690,22 +688,17 @@ ); } - private static CharSequence codeSeq; - private static Invocable code; + private static TestVM code; @BeforeClass public void compileTheCode() throws Exception { - if (codeSeq == null) { - StringBuilder sb = new StringBuilder(); - code = StaticMethodTest.compileClass(sb, "org/apidesign/vm4brwsr/Numbers"); - codeSeq = sb; - } + code = TestVM.compileClass("org/apidesign/vm4brwsr/Numbers"); } private static void assertExec( String msg, Class clazz, String method, Object expRes, Object... args) throws Exception { - Object ret = TestUtils.execCode(code, codeSeq, msg, clazz, method, expRes, args); + Object ret = code.execCode(msg, clazz, method, expRes, args); if (ret == null) { return; } @@ -713,10 +706,10 @@ double expD = ((Double)expRes).doubleValue(); double retD = ((Double)ret).doubleValue(); assertEquals(retD, expD, 0.000004, msg + " " - + StaticMethodTest.dumpJS(codeSeq)); + + code.toString()); return; } - assertEquals(ret, expRes, msg + " " + StaticMethodTest.dumpJS(codeSeq)); + assertEquals(ret, expRes, msg + " " + code.toString()); } }