1.1 --- a/vm/src/test/java/org/apidesign/vm4brwsr/ClassTest.java	Tue Feb 05 00:00:22 2013 +0100
     1.2 +++ b/vm/src/test/java/org/apidesign/vm4brwsr/ClassTest.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 org.testng.annotations.Test;
     1.9  import static org.testng.Assert.*;
    1.10  import org.testng.annotations.BeforeClass;
    1.11 @@ -185,22 +184,17 @@
    1.12          );
    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 -        if (codeSeq == null) {
    1.22 -            StringBuilder sb = new StringBuilder();
    1.23 -            code = StaticMethodTest.compileClass(sb, "org/apidesign/vm4brwsr/Classes");
    1.24 -            codeSeq = sb;
    1.25 -        }
    1.26 +        code = TestVM.compileClass("org/apidesign/vm4brwsr/Classes");
    1.27      }
    1.28      
    1.29      private void assertExec(
    1.30          String msg, Class clazz, String method, Object expRes, Object... args
    1.31      ) throws Exception {
    1.32 -        StaticMethodTest.assertExec(code, codeSeq, msg, clazz, method, expRes, args);
    1.33 +        code.assertExec(msg, clazz, method, expRes, args);
    1.34      }
    1.35      
    1.36  }