changeset 45730:828c6ffa57f7

8182996: Incorrect mapping Long type to JavaScript equivalent Reviewed-by: jlaskey, sundar
author hannesw
date Thu, 29 Jun 2017 12:05:08 +0200
parents 97f6db99c490
children c74c8aae4a8c
files nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AccessorProperty.java nashorn/test/src/jdk/nashorn/api/scripting/test/JDK_8182996_Test.java
diffstat 2 files changed, 70 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AccessorProperty.java	Wed Jun 28 11:27:32 2017 -0700
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AccessorProperty.java	Thu Jun 29 12:05:08 2017 +0200
@@ -349,8 +349,6 @@
         setType(hasDualFields() ? JSType.unboxedFieldType(initialValue) : Object.class);
         if (initialValue instanceof Integer) {
             invokeSetter(owner, ((Integer)initialValue).intValue());
-        } else if (initialValue instanceof Long) {
-            invokeSetter(owner, ((Long)initialValue).longValue());
         } else if (initialValue instanceof Double) {
             invokeSetter(owner, ((Double)initialValue).doubleValue());
         } else {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/src/jdk/nashorn/api/scripting/test/JDK_8182996_Test.java	Thu Jun 29 12:05:08 2017 +0200
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.api.scripting.test;
+
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import javax.script.*;
+
+import static org.testng.Assert.assertEquals;
+
+/**
+ * @bug 8182996
+ * @summary Incorrect mapping Long type to JavaScript equivalent
+ */
+@SuppressWarnings("javadoc")
+public class JDK_8182996_Test {
+
+    private ScriptEngine engine;
+    Bindings bindings;
+
+
+    @BeforeClass
+    public void setupTest() {
+        engine = new ScriptEngineManager().getEngineByName("js");
+        bindings = engine.getBindings(ScriptContext.ENGINE_SCOPE);
+
+        bindings.put("long1", Long.valueOf(1L));
+        bindings.put("long2", Long.valueOf(2L));
+        bindings.put("long2", Long.valueOf(3L));
+    }
+
+    @Test
+    public void testType() throws ScriptException {
+        assertEquals(engine.eval("typeof long1"), "object");
+        assertEquals(engine.eval("typeof long2"), "object");
+    }
+
+    @Test
+    public void testValue() throws ScriptException {
+        assertEquals(engine.eval("long1"), Long.valueOf(1));
+        assertEquals(engine.eval("long2"), Long.valueOf(3));
+        assertEquals(bindings.get("long1"), Long.valueOf(1));
+        assertEquals(bindings.get("long2"), Long.valueOf(3));
+    }
+
+}