revert the change from b5e7f85 and add some tests (#2226)

Author: rbri

rhino/src/main/java/org/mozilla/javascript/ScriptRuntime.java

@@ -236,6 +236,9 @@ public static ScriptableObject initSafeStandardObjects(
         NativeStringIterator.init(scope, sealed);
         registerRegExp(cx, scope, sealed);
 
+        NativeJavaObject.init(scope, sealed);
+        NativeJavaMap.init(scope, sealed);
+
         // define lazy-loaded properties using their class name
         // Depends on the old reflection-based lazy loading mechanism
         // to property initialize the prototype.
@@ -299,9 +302,6 @@ public static ScriptableObject initStandardObjects(
             Context cx, ScriptableObject scope, boolean sealed) {
         ScriptableObject s = initSafeStandardObjects(cx, scope, sealed);
 
-        NativeJavaObject.init(s, sealed);
-        NativeJavaMap.init(s, sealed);
-
         // These depend on the legacy initialization behavior of the lazy loading mechanism
         new LazilyLoadedCtor(
                 s, "Packages", "org.mozilla.javascript.NativeJavaTopPackage", sealed, true);

rhino/src/test/java/org/mozilla/javascript/tests/InitializationTest.java

@@ -2,6 +2,9 @@
 
 import static org.junit.Assert.assertEquals;
 
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import org.junit.Test;
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.ScriptableObject;
@@ -37,6 +40,88 @@ public void safeStandard() {
         }
     }
 
+    @Test
+    public void safeStandardSupportsStringFromContext() {
+        String code =
+                "let res = '';\n"
+                        + "res += str[0];\n"
+                        + "res += str.length;\n"
+                        + "res += ' ';\n"
+                        + "res += str;\n"
+                        + "res;";
+
+        try (Context cx = Context.enter()) {
+            ScriptableObject root = cx.initSafeStandardObjects();
+            root.put("str", root, "Rhino");
+            Object result = cx.evaluateString(root, code, "test", 1, null);
+            assertEquals("R5 Rhino", result);
+        }
+    }
+
+    @Test
+    public void safeStandardSupportsArrayFromContext() {
+        String code =
+                "let res = '';\n"
+                        + "res += arr[0];\n"
+                        + "res += arr.length;\n"
+                        + "res += ' ';\n"
+                        + "for (let elem in arr) { res += arr[elem]; }\n"
+                        + "res += ' ';\n"
+                        + "for (let elem of arr) { res += elem; }\n"
+                        + "res;";
+
+        try (Context cx = Context.enter()) {
+            ScriptableObject root = cx.initSafeStandardObjects();
+            root.put("arr", root, new String[] {"a", "b", "d"});
+            Object result = cx.evaluateString(root, code, "test", 1, null);
+            assertEquals("a3 abd abd", result);
+        }
+    }
+
+    @Test
+    public void safeStandardSupportsListFromContext() {
+        String code =
+                "let res = '';\n"
+                        + "res += lst[0];\n"
+                        + "res += lst.length;\n"
+                        + "res += ' ';\n"
+                        + "for (let elem in lst) { res += lst[elem]; }\n"
+                        + "res += ' ';\n"
+                        + "for (let elem of lst) { res += elem; }\n"
+                        + "res;";
+
+        try (Context cx = Context.enter()) {
+            ScriptableObject root = cx.initSafeStandardObjects();
+            root.put("lst", root, List.of("a", "b", "c"));
+            Object result = cx.evaluateString(root, code, "test", 1, null);
+            assertEquals("a3 abc abc", result);
+        }
+    }
+
+    @Test
+    public void safeStandardSupportsMapFromContext() {
+        String code = "let res = '';\n" + "for (let elem of mp) { res += elem; }\n" + "res;";
+
+        try (Context cx = Context.enter()) {
+            ScriptableObject root = cx.initSafeStandardObjects();
+            root.put("mp", root, Map.of("k0", "v0"));
+            Object result = cx.evaluateString(root, code, "test", 1, null);
+            assertEquals("k0,v0", result);
+        }
+    }
+
+    @Test
+    public void safeStandardSupportsSetFromContext() {
+        String code = "let res = '';\n" + "for (let elem of mp) { res += elem; }\n" + "res;";
+
+        try (Context cx = Context.enter()) {
+            ScriptableObject root = cx.initSafeStandardObjects();
+            root.put("mp", root, Set.of("v0"));
+            Object result = cx.evaluateString(root, code, "test", 1, null);
+            assertEquals("v0", result);
+        }
+    }
+
     @Test
     public void standardSealed() {
         try (Context cx = Context.enter()) {