aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorsundar <none@none>2014-05-06 17:54:15 +0530
committersundar <none@none>2014-05-06 17:54:15 +0530
commit9d9ae273b3658af8d6bb6882250ffd1c6c1ba149 (patch)
tree66c0e8d12013159a427edef1c5443f83ccef441c /test
parent67726fbf7d0d142b5d436dfede4c3f79a2b82be4 (diff)
downloadnashorn-9d9ae273b3658af8d6bb6882250ffd1c6c1ba149.tar.gz
8042364: Make __proto__ ES6 draft compliant
Reviewed-by: jlaskey, lagergren, attila
Diffstat (limited to 'test')
-rw-r--r--test/script/basic/JDK-8024120.js4
-rw-r--r--test/script/basic/JDK-8024174.js2
-rw-r--r--test/script/basic/JDK-8042364.js65
-rw-r--r--test/script/basic/JDK-8042364.js.EXPECTED5
4 files changed, 71 insertions, 5 deletions
diff --git a/test/script/basic/JDK-8024120.js b/test/script/basic/JDK-8024120.js
index 0ac4ff98..d2913d52 100644
--- a/test/script/basic/JDK-8024120.js
+++ b/test/script/basic/JDK-8024120.js
@@ -32,10 +32,6 @@ var obj = {};
obj.__proto__ = null;
-if (obj.__proto__ !== null || typeof(obj.__proto__) != 'object') {
- fail("obj.__proto__ is expected to be null");
-}
-
var p = Object.getPrototypeOf(obj);
if (p !== null || typeof(p) != 'object') {
fail("Object.getPrototypeOf(obj) is expected to be null");
diff --git a/test/script/basic/JDK-8024174.js b/test/script/basic/JDK-8024174.js
index 5fd48e17..bd9206a6 100644
--- a/test/script/basic/JDK-8024174.js
+++ b/test/script/basic/JDK-8024174.js
@@ -46,6 +46,6 @@ var obj2 = {
__proto__: null
};
-if (obj2.__proto__ !== null || Object.getPrototypeOf(obj2) !== null) {
+if (Object.getPrototypeOf(obj2) !== null) {
fail("obj2.__proto__ was not set to null inside literal");
}
diff --git a/test/script/basic/JDK-8042364.js b/test/script/basic/JDK-8042364.js
new file mode 100644
index 00000000..d8b81e24
--- /dev/null
+++ b/test/script/basic/JDK-8042364.js
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2014, 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.
+ *
+ * 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.
+ */
+
+/**
+ * JDK-8042364: Make __proto__ ES6 draft compliant
+ *
+ * @test
+ * @run
+ */
+
+// check for Object.prototype.__proto__ accessor property
+print("Object.prototype has __proto__?",
+ Object.prototype.hasOwnProperty("__proto__"))
+
+var desc = Object.getOwnPropertyDescriptor(Object.prototype, "__proto__")
+print("descriptor");
+print(JSON.stringify(desc))
+print("getter", desc.get)
+print("setter", desc.set)
+
+// no computed "__proto__" name, only identifier!
+var p = {}
+var obj = {
+ "__proto__" : p
+}
+
+if (Object.getPrototypeOf(obj) === p) {
+ fail("obj has wrong __proto__, allows computed __proto__!")
+}
+
+if (obj.__proto__ !== p) {
+ fail("__proto__ not created as normal property!")
+}
+
+if (Object.getPrototypeOf(obj) !== Object.prototype) {
+ fail("obj has wrong __proto__")
+}
+
+var obj2 = {
+ __proto__: p
+}
+
+if (Object.getPrototypeOf(obj2) !== p) {
+ fail("can't set __proto__ in object literal")
+}
diff --git a/test/script/basic/JDK-8042364.js.EXPECTED b/test/script/basic/JDK-8042364.js.EXPECTED
new file mode 100644
index 00000000..b92947a8
--- /dev/null
+++ b/test/script/basic/JDK-8042364.js.EXPECTED
@@ -0,0 +1,5 @@
+Object.prototype has __proto__? true
+descriptor
+{"configurable":true,"enumerable":false}
+getter function getProto() { [native code] }
+setter function setProto() { [native code] }