[GR-22168] Increase test coverage.

PullRequest: js/1452

Author: wirthi

graal-js/src/com.oracle.truffle.js.parser/src/com/oracle/truffle/js/parser/GraalJSTranslator.java

@@ -286,14 +286,6 @@ protected final ScriptNode translateScript(FunctionNode functionNode) {
         return ScriptNode.fromFunctionRoot(context, functionExpression.getFunctionNode());
     }
 
-    protected final JavaScriptNode translateExpression(Expression expression) {
-        try (EnvironmentCloseable dummyFunctionEnv = enterFunctionEnvironment(true, false, false, false, false, false)) {
-            currentFunction().setNeedsParentFrame(true);
-            currentFunction().freeze(); // cannot add frame slots
-            return transform(expression);
-        }
-    }
-
     protected final JavaScriptNode transformFunction(FunctionNode functionNode) {
         return transform(functionNode);
     }

graal-js/src/com.oracle.truffle.js.parser/src/com/oracle/truffle/js/parser/JavaScriptTranslator.java

@@ -45,7 +45,6 @@
 import com.oracle.js.parser.ir.Scope;
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.js.lang.JavaScriptLanguage;
-import com.oracle.truffle.js.nodes.JavaScriptNode;
 import com.oracle.truffle.js.nodes.NodeFactory;
 import com.oracle.truffle.js.nodes.ScriptNode;
 import com.oracle.truffle.js.nodes.function.FunctionRootNode;
@@ -113,10 +112,6 @@ public static ScriptNode translateFunction(NodeFactory factory, JSContext contex
         return new JavaScriptTranslator(factory, context, source, prologLength, env, isParentStrict).translateScript(rootNode);
     }
 
-    public static JavaScriptNode translateExpression(NodeFactory factory, JSContext context, Environment env, Source source, boolean isParentStrict, com.oracle.js.parser.ir.Expression expression) {
-        return new JavaScriptTranslator(factory, context, source, 0, env, isParentStrict).translateExpression(expression);
-    }
-
     public static JSModuleRecord translateModule(NodeFactory factory, JSContext context, Source source, JSModuleLoader moduleLoader) {
         FunctionNode parsed = GraalJSParserHelper.parseModule(context, source, context.getParserOptions().putStrict(true));
         JavaScriptTranslator translator = new JavaScriptTranslator(factory, context, source, 0, null, true);

graal-js/src/com.oracle.truffle.js.test/js/runtime/indirect_eval.js

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2020, 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
+ */
+/*
+ * Test otherwise untested indirect eval.
+ */
+ 
+load('../assert.js');
+
+var indirecteval = eval;
+assertSame(42, indirecteval(42));
+assertSame(42n, indirecteval(42n));
+assertSame(42, indirecteval(Debug.createSafeInteger(42)));
+assertSame(42.5, indirecteval(42.5));
+assertSame(true, indirecteval(true));
+
+var symbol = Symbol('test');
+assertSame(symbol, indirecteval(symbol));
+
+var obj = {foo:'bar'};
+assertSame(obj, indirecteval(obj));
+
+true;

graal-js/src/com.oracle.truffle.js.test/js/runtime/jsToObjectArray.js

@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2020, 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
+ */
+/*
+ * Test otherwise untested JSToObjectArray node.
+ */
+ 
+load('../assert.js');
+
+function fn() { return arguments; }
+var obj = {};
+
+function testReflect(value) {
+    assertFail( ()=>{Reflect.apply(fn, obj, value);}, "is not an Object");
+}
+
+testReflect(true);
+testReflect(42);
+testReflect(42.5);
+testReflect("test");
+
+true;

graal-js/src/com.oracle.truffle.js.test/src/com/oracle/truffle/js/test/nashorn/NashornGlobalTest.java

@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2020, 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.oracle.truffle.js.test.nashorn;
+
+import org.graalvm.polyglot.Context;
+import org.graalvm.polyglot.Source;
+import org.graalvm.polyglot.Value;
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.oracle.truffle.js.lang.JavaScriptLanguage;
+import com.oracle.truffle.js.runtime.JSContextOptions;
+import com.oracle.truffle.js.test.JSTest;
+
+public class NashornGlobalTest {
+    private static boolean testIntl(String sourceText) {
+        try (Context context = JSTest.newContextBuilder().option(JSContextOptions.NASHORN_COMPATIBILITY_MODE_NAME,
+                        "true").option(JSContextOptions.SCRIPTING_NAME, "true").allowAllAccess(true).build()) {
+            Value result = context.eval(Source.newBuilder(JavaScriptLanguage.ID, sourceText, "nashorn-global-test").buildLiteral());
+            Assert.assertTrue(result.isBoolean());
+            return result.asBoolean();
+        }
+    }
+
+    @Test
+    public void testEXEC() {
+        Assert.assertTrue(testIntl("var a = $EXEC('ls'); a.length > 0;"));
+    }
+
+    @Test
+    public void testLoadFileNonExistent() {
+        String src = "var ret=false; var FILE = Java.type('java.io.File'); \n" +
+                        "try { load(new FILE('nonexistent.file')); } \n" +
+                        "catch (ex) { ret = ex instanceof EvalError && ex.message.indexOf('nonexistent.file') >= 0; }; \n" +
+                        "ret;";
+        Assert.assertTrue(testIntl(src));
+    }
+
+    @Test
+    public void testLoadURLNonExistent() {
+        String src = "var ret=false; var URL = Java.type('java.net.URL'); \n" +
+                        "try { load(new URL('file://nonexistent.file')); } \n" +
+                        "catch (ex) { ret = ex instanceof EvalError && ex.message.indexOf('nonexistent.file') >= 0; }; \n" +
+                        "ret;";
+        Assert.assertTrue(testIntl(src));
+    }
+}

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/builtins/JSCollator.java

@@ -62,6 +62,7 @@
 import com.oracle.truffle.api.object.LocationModifier;
 import com.oracle.truffle.api.object.Property;
 import com.oracle.truffle.api.object.Shape;
+import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.js.builtins.intl.CollatorFunctionBuiltins;
 import com.oracle.truffle.js.builtins.intl.CollatorPrototypeBuiltins;
 import com.oracle.truffle.js.lang.JavaScriptLanguage;
@@ -348,6 +349,7 @@ private static CallTarget createGetCompareCallTarget(JSContext context) {
 
             @CompilationFinal private ContextReference<JSRealm> realmRef;
             @Child private PropertySetNode setBoundObjectNode = PropertySetNode.createSetHidden(BOUND_OBJECT_KEY, context);
+            private final BranchProfile errorBranch = BranchProfile.create();
 
             @Override
             public Object execute(VirtualFrame frame) {
@@ -360,6 +362,7 @@ public Object execute(VirtualFrame frame) {
                     InternalState state = getInternalState((DynamicObject) collatorObj);
 
                     if (state == null || !state.initializedCollator) {
+                        errorBranch.enter();
                         throw Errors.createTypeErrorMethodCalledOnNonObjectOrWrongType("compare");
                     }
 
@@ -385,6 +388,7 @@ public Object execute(VirtualFrame frame) {
 
                     return state.boundCompareFunction;
                 }
+                errorBranch.enter();
                 throw Errors.createTypeErrorTypeXExpected(CLASS_NAME);
             }
         });