Skip to content

Commit

Permalink
test cases from #1242
Browse files Browse the repository at this point in the history
fix taken from p-bakker's sugestion
  • Loading branch information
rbri committed Feb 19, 2023
1 parent d792c69 commit a21c0bc
Show file tree
Hide file tree
Showing 2 changed files with 76 additions and 2 deletions.
8 changes: 6 additions & 2 deletions src/org/mozilla/javascript/AbstractEcmaObjectOperations.java
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,9 @@ static void put(Context cx, Scriptable o, String p, Object v, boolean isThrow) {
if (base == null) base = o;

if (base instanceof ScriptableObject) {
((ScriptableObject) base).putImpl(p, 0, o, v, isThrow);
if (((ScriptableObject) base).putImpl(p, 0, o, v, isThrow)) return;

o.put(p, o, v);
} else {
base.put(p, o, v);
}
Expand All @@ -223,7 +225,9 @@ static void put(Context cx, Scriptable o, int p, Object v, boolean isThrow) {
if (base == null) base = o;

if (base instanceof ScriptableObject) {
((ScriptableObject) base).putImpl(null, p, o, v, isThrow);
if (((ScriptableObject) base).putImpl(null, p, o, v, isThrow)) return;

o.put(p, o, v);
} else {
base.put(p, o, v);
}
Expand Down
70 changes: 70 additions & 0 deletions testsrc/org/mozilla/javascript/tests/es6/NativeObjectTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,76 @@ public void testAssignUnwritable() {
"error");
}

@Test
public void testAssignVariousKeyTypes() {
evaluateAndAssert(
"var strKeys = Object.assign({}, {a: 1, b: 2});\n"
+ "var arrayKeys = Object.assign({}, ['a', 'b']);\n"
+ "var res = 'strKeys: ' + JSON.stringify(strKeys) + "
+ "' arrayKeys:' + JSON.stringify(arrayKeys);\n"
+ "res",
"strKeys: {\"a\":1,\"b\":2} arrayKeys:{\"0\":\"a\",\"1\":\"b\"}");
}

@Test
public void testAssignWithPrototypeStringKeys() {
final String script =
"var targetProto = { a: 1, b: 2 };\n"
+ "var target = Object.create(targetProto);\n"
+ "var source = { b: 4, c: 5 };\n"
+ "var assigned = Object.assign(target, source);\n"
+ "var res = 'targetProto: ' + JSON.stringify(targetProto) + "
+ "' target: ' + JSON.stringify(target) + "
+ "' assigned: ' + JSON.stringify(assigned);\n"
+ "res";

evaluateAndAssert(
script,
"targetProto: {\"a\":1,\"b\":2} target: {\"b\":4,\"c\":5} assigned: {\"b\":4,\"c\":5}");
}

@Test
public void testAssignWithPrototypeNumericKeys() {
final String script =
"var targetProto = {0: 'a', 1: 'b'};\n"
+ "var target = Object.create(targetProto);\n"
+ "var source = {1: 'c', 2: 'd'};\n"
+ "var assigned = Object.assign(target, source);\n"
+ "var res = 'targetProto: ' + JSON.stringify(targetProto) + "
+ "' target: ' + JSON.stringify(target) + "
+ "' assigned: ' + JSON.stringify(assigned);\n"
+ "res";

evaluateAndAssert(
script,
"targetProto: {\"0\":\"a\",\"1\":\"b\"} target: {\"1\":\"c\",\"2\":\"d\"} assigned: {\"1\":\"c\",\"2\":\"d\"}");
}

@Test
public void testAssignWithPrototypeWithGettersAndSetters() {
final String script =
"var targetProto = {"
+ "_a: 1, get a() { return this._a }, set a(val) { this._a = val+10 },"
+ " _b: 2, get b() { return this._b }, set b(val) { this._b = val+10 }"
+ "};\n"
+ "var target = Object.create(targetProto);\n"
+ "var source = {"
+ "_b: 4, get b() { return this._b * 4 }, set b(val) { this._b = val+10 },"
+ " _c: 5, get c() { return this._c }, set c(val) { this._c = val+10 }};\n"
+ "var assigned = Object.assign(target, source);\n"
+ "var res = 'targetProto: ' + JSON.stringify(targetProto) + "
+ "' target: ' + JSON.stringify(target) + "
+ "' assigned: ' + JSON.stringify(assigned) + "
+ "' assigned.a: ' + assigned.a + "
+ "' assigned.b: ' + assigned.b + "
+ "' assigned.c: ' + assigned.c;\n"
+ "res";

evaluateAndAssert(
script,
"targetProto: {\"_a\":1,\"a\":1,\"_b\":2,\"b\":2} target: {\"_b\":26,\"_c\":5,\"c\":5} assigned: {\"_b\":26,\"_c\":5,\"c\":5} assigned.a: 1 assigned.b: 26 assigned.c: 5");
}

@Test
public void testSetPrototypeOfNull() {
evaluateAndAssert(
Expand Down

0 comments on commit a21c0bc

Please sign in to comment.