diff -r 62c327a1e23f -r 59d5596a9c6c vm/src/test/java/org/apidesign/vm4brwsr/ArrayTest.java --- a/vm/src/test/java/org/apidesign/vm4brwsr/ArrayTest.java Thu Jan 24 17:08:02 2013 +0100 +++ b/vm/src/test/java/org/apidesign/vm4brwsr/ArrayTest.java Mon Feb 11 12:46:43 2013 +0100 @@ -17,7 +17,6 @@ */ package org.apidesign.vm4brwsr; -import javax.script.Invocable; import static org.testng.Assert.*; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -76,18 +75,13 @@ assertExec("Returns 'false'", Array.class, "instanceOfArray__ZLjava_lang_Object_2", Double.valueOf(0), "non-array"); } - 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/Array" - ); - codeSeq = sb; + code = TestVM.compileClass("org/apidesign/vm4brwsr/Array"); } 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); } }