Fix Android ITs.

Author: aardvark179

it-android/src/main/java/org/mozilla/javascript/android/TestCase.java

@@ -13,6 +13,7 @@
 import org.mozilla.javascript.ContextFactory;
 import org.mozilla.javascript.ScriptRuntime;
 import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.TopLevel;
 
 /**
  * Utility class, that search for testcases in "assets/tests".
@@ -24,7 +25,7 @@
 public class TestCase {
 
     private final String name;
-    private final Scriptable global;
+    private final TopLevel global;
     private final AssetManager assetManager;
 
     private static final ContextFactory factory =
@@ -47,7 +48,7 @@ protected Context makeContext() {
                 }
             };
 
-    public TestCase(String name, Scriptable global, AssetManager assetManager) {
+    public TestCase(String name, TopLevel global, AssetManager assetManager) {
         this.name = name;
         this.global = global;
         this.assetManager = assetManager;
@@ -58,9 +59,7 @@ public String run() {
         try (InputStream in = assetManager.open("tests/" + name);
                 Reader rdr = new InputStreamReader(in, StandardCharsets.UTF_8)) {
 
-            Scriptable scope = cx.newObject(global);
-            scope.setPrototype(global);
-            scope.setParentScope(null);
+            Scriptable scope = global.createIsolate();
             Object result = cx.evaluateReader(scope, rdr, name, 1, null);
             return ScriptRuntime.toString(result);
         } catch (IOException e) {
@@ -79,7 +78,7 @@ public static List<TestCase> getTestCases(android.content.Context context) throw
 
         AssetManager assetManager = context.getAssets();
         // define assert object
-        ScriptableObject global;
+        TopLevel global;
         Context cx = factory.enterContext();
         try (InputStream in = assetManager.open("assert.js");
                 Reader rdr = new InputStreamReader(in, StandardCharsets.UTF_8)) {