Cleaning up the test harness flow
authorJaroslav Tulach <jaroslav.tulach@apidesign.org>
Fri, 13 Mar 2015 11:58:30 +0100
branchflow
changeset 1817c1fd23f4e0ae
parent 1816 6c1fa412c72d
child 1818 21089a85f02b
Cleaning up the test harness
rt/flow/src/test/java/org/apidesign/bck2brwsr/flow/TestVM.java
     1.1 --- a/rt/flow/src/test/java/org/apidesign/bck2brwsr/flow/TestVM.java	Fri Mar 13 11:41:04 2015 +0100
     1.2 +++ b/rt/flow/src/test/java/org/apidesign/bck2brwsr/flow/TestVM.java	Fri Mar 13 11:58:30 2015 +0100
     1.3 @@ -17,7 +17,6 @@
     1.4   */
     1.5  package org.apidesign.bck2brwsr.flow;
     1.6  
     1.7 -import java.io.ByteArrayInputStream;
     1.8  import java.io.File;
     1.9  import java.io.FileOutputStream;
    1.10  import java.io.IOException;
    1.11 @@ -28,9 +27,7 @@
    1.12  import java.util.ArrayList;
    1.13  import java.util.Arrays;
    1.14  import java.util.Enumeration;
    1.15 -import java.util.HashSet;
    1.16  import java.util.List;
    1.17 -import java.util.Set;
    1.18  import javax.script.Invocable;
    1.19  import javax.script.ScriptContext;
    1.20  import javax.script.ScriptEngine;
    1.21 @@ -38,7 +35,6 @@
    1.22  import javax.script.ScriptException;
    1.23  import org.apidesign.vm4brwsr.Bck2Brwsr;
    1.24  import org.apidesign.vm4brwsr.Bck2Brwsr.Flow;
    1.25 -import org.apidesign.vm4brwsr.ObfuscationLevel;
    1.26  import static org.testng.Assert.*;
    1.27  
    1.28  public final class TestVM {
    1.29 @@ -191,10 +187,10 @@
    1.30       */
    1.31      private Invocable getCode() throws ScriptException {
    1.32          if (code == null) {
    1.33 -            Object res = js.eval(code.toString());
    1.34 +            js.eval(codeSeq.toString());
    1.35 +            js.getContext().setAttribute("loader", this, ScriptContext.ENGINE_SCOPE);
    1.36 +            this.bck2brwsr = js.eval("bck2brwsr(function(n) { return loader.get(n); })");
    1.37              code = (Invocable) js;
    1.38 -            this.bck2brwsr = ((ScriptEngine)code).eval("bck2brwsr(function(n) { return loader.get(n); })");
    1.39 -            ((ScriptEngine)code).getContext().setAttribute("loader", this, ScriptContext.ENGINE_SCOPE);
    1.40          }
    1.41          return (Invocable)code;
    1.42      }