diff -r b9318fe303cd -r dcb98731b000 vm/src/test/java/org/apidesign/vm4brwsr/StaticMethodTest.java --- a/vm/src/test/java/org/apidesign/vm4brwsr/StaticMethodTest.java Mon Sep 24 11:07:38 2012 +0200 +++ b/vm/src/test/java/org/apidesign/vm4brwsr/StaticMethodTest.java Tue Sep 25 12:11:03 2012 +0200 @@ -17,15 +17,7 @@ */ package org.apidesign.vm4brwsr; -import org.apidesign.vm4brwsr.ByteCodeToJavaScript; import java.io.IOException; -import java.io.InputStream; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.Set; -import java.util.TreeSet; import javax.script.Invocable; import javax.script.ScriptEngine; import javax.script.ScriptEngineManager; @@ -162,32 +154,7 @@ if (sb == null) { sb = new StringBuilder(); } - Set processed = new HashSet(); - - LinkedList toProcess = new LinkedList(Arrays.asList(names)); - for (;;) { - toProcess.removeAll(processed); - if (toProcess.isEmpty()) { - break; - } - String name = toProcess.getFirst(); - processed.add(name); - if (name.startsWith("java/") && !name.equals("java/lang/Object")) { - continue; - } - InputStream is = StaticMethodTest.class.getClassLoader().getResourceAsStream(name + ".class"); - assertNotNull(is, "Class file found"); - try { - ByteCodeToJavaScript.compile(is, sb, toProcess); - } catch (RuntimeException ex) { - int lastBlock = sb.lastIndexOf("{"); - throw new IllegalStateException( - "Error while compiling " + name + "\n" + - sb.substring(0, sb.length()), - ex - ); - } - } + GenJS.compile(sb, names); ScriptEngineManager sem = new ScriptEngineManager(); ScriptEngine js = sem.getEngineByExtension("js"); try {