1.1 --- a/vm/src/test/java/org/apidesign/vm4brwsr/ArrayTest.java	Thu Jan 24 17:08:02 2013 +0100
     1.2 +++ b/vm/src/test/java/org/apidesign/vm4brwsr/ArrayTest.java	Mon Feb 11 12:46:43 2013 +0100
     1.3 @@ -17,7 +17,6 @@
     1.4   */
     1.5  package org.apidesign.vm4brwsr;
     1.6  
     1.7 -import javax.script.Invocable;
     1.8  import static org.testng.Assert.*;
     1.9  import org.testng.annotations.BeforeClass;
    1.10  import org.testng.annotations.Test;
    1.11 @@ -76,18 +75,13 @@
    1.12          assertExec("Returns 'false'", Array.class, "instanceOfArray__ZLjava_lang_Object_2", Double.valueOf(0), "non-array");
    1.13      }
    1.14      
    1.15 -    private static CharSequence codeSeq;
    1.16 -    private static Invocable code;
    1.17 +    private static TestVM code;
    1.18      
    1.19      @BeforeClass 
    1.20      public void compileTheCode() throws Exception {
    1.21 -        StringBuilder sb = new StringBuilder();
    1.22 -        code = StaticMethodTest.compileClass(sb, 
    1.23 -            "org/apidesign/vm4brwsr/Array"
    1.24 -        );
    1.25 -        codeSeq = sb;
    1.26 +        code = TestVM.compileClass("org/apidesign/vm4brwsr/Array");
    1.27      }
    1.28      private static void assertExec(String msg, Class clazz, String method, Object expRes, Object... args) throws Exception {
    1.29 -        StaticMethodTest.assertExec(code, codeSeq, msg, clazz, method, expRes, args);
    1.30 +        code.assertExec(msg, clazz, method, expRes, args);
    1.31      }
    1.32  }