1.1 --- a/vm/src/test/java/org/apidesign/vm4brwsr/StaticMethodTest.java	Mon Sep 24 11:07:38 2012 +0200
     1.2 +++ b/vm/src/test/java/org/apidesign/vm4brwsr/StaticMethodTest.java	Tue Sep 25 12:11:03 2012 +0200
     1.3 @@ -17,15 +17,7 @@
     1.4  */
     1.5  package org.apidesign.vm4brwsr;
     1.6  
     1.7 -import org.apidesign.vm4brwsr.ByteCodeToJavaScript;
     1.8  import java.io.IOException;
     1.9 -import java.io.InputStream;
    1.10 -import java.util.Arrays;
    1.11 -import java.util.HashSet;
    1.12 -import java.util.Iterator;
    1.13 -import java.util.LinkedList;
    1.14 -import java.util.Set;
    1.15 -import java.util.TreeSet;
    1.16  import javax.script.Invocable;
    1.17  import javax.script.ScriptEngine;
    1.18  import javax.script.ScriptEngineManager;
    1.19 @@ -162,32 +154,7 @@
    1.20          if (sb == null) {
    1.21              sb = new StringBuilder();
    1.22          }
    1.23 -        Set<String> processed = new HashSet<String>();
    1.24 -
    1.25 -        LinkedList<String> toProcess = new LinkedList<String>(Arrays.asList(names));
    1.26 -        for (;;) {
    1.27 -            toProcess.removeAll(processed);
    1.28 -            if (toProcess.isEmpty()) {
    1.29 -                break;
    1.30 -            }
    1.31 -            String name = toProcess.getFirst();
    1.32 -            processed.add(name);
    1.33 -            if (name.startsWith("java/") && !name.equals("java/lang/Object")) {
    1.34 -                continue;
    1.35 -            }
    1.36 -            InputStream is = StaticMethodTest.class.getClassLoader().getResourceAsStream(name + ".class");
    1.37 -            assertNotNull(is, "Class file found");
    1.38 -            try {
    1.39 -                ByteCodeToJavaScript.compile(is, sb, toProcess);
    1.40 -            } catch (RuntimeException ex) {
    1.41 -                int lastBlock = sb.lastIndexOf("{");
    1.42 -                throw new IllegalStateException(
    1.43 -                    "Error while compiling " + name + "\n" + 
    1.44 -                    sb.substring(0, sb.length()), 
    1.45 -                    ex
    1.46 -                );
    1.47 -            }
    1.48 -        }
    1.49 +        GenJS.compile(sb, names);
    1.50          ScriptEngineManager sem = new ScriptEngineManager();
    1.51          ScriptEngine js = sem.getEngineByExtension("js");
    1.52          try {