diff -r 9b5868bf56ec -r 59d5596a9c6c vm/src/test/java/org/apidesign/vm4brwsr/ExceptionsTest.java --- a/vm/src/test/java/org/apidesign/vm4brwsr/ExceptionsTest.java Thu Jan 10 13:09:19 2013 +0100 +++ b/vm/src/test/java/org/apidesign/vm4brwsr/ExceptionsTest.java Mon Feb 11 12:46:43 2013 +0100 @@ -17,7 +17,6 @@ */ package org.apidesign.vm4brwsr; -import javax.script.Invocable; import javax.script.ScriptException; import static org.testng.Assert.*; import org.testng.annotations.BeforeClass; @@ -81,8 +80,7 @@ } @Test public void testThreeCalls() throws Exception { - Object vm = code.invokeFunction("bck2brwsr"); - Object clazz = code.invokeMethod(vm, "loadClass", Exceptions.class.getName()); + Object clazz = code.loadClass("loadClass", Exceptions.class.getName()); String method = "readCounter__ILjava_lang_String_2"; @@ -104,18 +102,13 @@ } } - private static CharSequence codeSeq; - private static Invocable code; + private static TestVM code; @BeforeClass public void compileTheCode() throws Exception { - StringBuilder sb = new StringBuilder(); - code = StaticMethodTest.compileClass(sb, - "org/apidesign/vm4brwsr/Exceptions" - ); - codeSeq = sb; + code = TestVM.compileClass("org/apidesign/vm4brwsr/Exceptions"); } private static void assertExec(String msg, Class clazz, String method, Object expRes, Object... args) throws Exception { - StaticMethodTest.assertExec(code, codeSeq, msg, clazz, method, expRes, args); + code.assertExec(msg, clazz, method, expRes, args); } }