# HG changeset patch # User sundar # Date 1442910654 -19800 # Node ID bef42ab8880a63d465c466d0fcf0acb2c8f61eea # Parent 39f7c847e0be03ac9415dca04ce97f5bb0bc46d2 8136894: test/script/currently-failing/gettersetter.js passes, move it out of currently-failing tests Reviewed-by: hannesw, mhaupt diff -r 39f7c847e0be -r bef42ab8880a nashorn/test/script/currently-failing/gettersetter.js --- a/nashorn/test/script/currently-failing/gettersetter.js Tue Sep 22 12:57:15 2015 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -/* - * 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. - */ - -/** - * @test - * @option -Dnashorn.debug=true - * @fork - */ - -load(__DIR__ + "maputil.js"); - -function Foo() { - return { - get foo() { return 42; }, - set foo(x) {} - } -} - -var obj1 = Foo(); -var obj2 = Foo(); - -assertSameMap(obj1, obj2, "Object literals before change"); - -Object.defineProperty(obj2, "foo", { get: function() { return 'hello' } }); -assertSameMap(obj1, obj2); - -Object.defineProperty(obj2, "foo", { set: function(x) { print(x) } }); -assertSameMap(obj1, obj2); diff -r 39f7c847e0be -r bef42ab8880a nashorn/test/script/maptests/gettersetter.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/nashorn/test/script/maptests/gettersetter.js Tue Sep 22 14:00:54 2015 +0530 @@ -0,0 +1,48 @@ +/* + * 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. + */ + +/** + * @test + * @option -Dnashorn.debug=true + * @fork + */ + +load(__DIR__ + "maputil.js"); + +function Foo() { + return { + get foo() { return 42; }, + set foo(x) {} + } +} + +var obj1 = Foo(); +var obj2 = Foo(); + +assertSameMap(obj1, obj2, "Object literals before change"); + +Object.defineProperty(obj2, "foo", { get: function() { return 'hello' } }); +assertSameMap(obj1, obj2); + +Object.defineProperty(obj2, "foo", { set: function(x) { print(x) } }); +assertSameMap(obj1, obj2);