From f30120ab961916c78b1250c2346f89ee8e2349fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bargull?= Date: Wed, 30 Apr 2025 14:15:49 +0200 Subject: [PATCH] Replace assertThrowsInstanceOf with assert.throws in sm/Proxy --- .../Proxy/define-writable-as-non-writable.js | 6 +-- .../staging/sm/Proxy/delete-non-extensible.js | 4 +- test/staging/sm/Proxy/getPrototypeOf.js | 38 +++++++------------ .../staging/sm/Proxy/ownkeys-allowed-types.js | 4 +- .../sm/Proxy/ownkeys-trap-duplicates.js | 4 +- .../sm/Proxy/proxy-constructNonObject.js | 4 +- .../sm/Proxy/proxy-no-receiver-overwrite.js | 4 +- .../Proxy/report-writable-as-non-writable.js | 6 +-- .../staging/sm/Proxy/revoke-as-side-effect.js | 7 ++-- .../revoked-get-function-realm-typeerror.js | 4 +- test/staging/sm/Proxy/setPrototypeOf.js | 33 ++++++---------- 11 files changed, 43 insertions(+), 71 deletions(-) diff --git a/test/staging/sm/Proxy/define-writable-as-non-writable.js b/test/staging/sm/Proxy/define-writable-as-non-writable.js index df22630fff..0cb6415535 100644 --- a/test/staging/sm/Proxy/define-writable-as-non-writable.js +++ b/test/staging/sm/Proxy/define-writable-as-non-writable.js @@ -21,9 +21,7 @@ var proxy = new Proxy(target, { } }); -assertThrowsInstanceOf( - () => Object.defineProperty(proxy, "test", {writable: false}), TypeError); +assert.throws(TypeError, () => Object.defineProperty(proxy, "test", {writable: false})); -assertThrowsInstanceOf( - () => Reflect.defineProperty(proxy, "test", {writable: false}), TypeError); +assert.throws(TypeError, () => Reflect.defineProperty(proxy, "test", {writable: false})); diff --git a/test/staging/sm/Proxy/delete-non-extensible.js b/test/staging/sm/Proxy/delete-non-extensible.js index 7786467f97..dbdd746113 100644 --- a/test/staging/sm/Proxy/delete-non-extensible.js +++ b/test/staging/sm/Proxy/delete-non-extensible.js @@ -23,6 +23,6 @@ var proxy = new Proxy(target, { assert.sameValue(delete proxy.missing, true); assert.sameValue(Reflect.deleteProperty(proxy, "missing"), true); -assertThrowsInstanceOf(() => { delete proxy.test; }, TypeError); -assertThrowsInstanceOf(() => Reflect.deleteProperty(proxy, "test"), TypeError); +assert.throws(TypeError, () => { delete proxy.test; }); +assert.throws(TypeError, () => Reflect.deleteProperty(proxy, "test")); diff --git a/test/staging/sm/Proxy/getPrototypeOf.js b/test/staging/sm/Proxy/getPrototypeOf.js index e6f8525258..0b8232cb67 100644 --- a/test/staging/sm/Proxy/getPrototypeOf.js +++ b/test/staging/sm/Proxy/getPrototypeOf.js @@ -47,7 +47,7 @@ p = rev.proxy; assert.sameValue(Object.getPrototypeOf(p), Object.prototype); rev.revoke(); -assertThrowsInstanceOf(() => Object.getPrototypeOf(p), TypeError); +assert.throws(TypeError, () => Object.getPrototypeOf(p)); // 4. Let target be the value of the [[ProxyTarget]] internal slot of O. // 5. Let trap be ? GetMethod(handler, "getPrototypeOf"). @@ -67,8 +67,7 @@ assertThrowsValue(() => Object.getPrototypeOf(p), 42); // The trap might not be callable. p = new Proxy({}, { getPrototypeOf: 17 }); -assertThrowsInstanceOf(() => Object.getPrototypeOf(p), - TypeError); +assert.throws(TypeError, () => Object.getPrototypeOf(p)); // 6. If trap is undefined, then // a. Return ? target.[[GetPrototypeOf]](). @@ -154,44 +153,34 @@ p = new Proxy(typeTestingTarget, { getPrototypeOf() { return rval; } }); function returnsPrimitives() { rval = undefined; - assertThrowsInstanceOf(() => Object.getPrototypeOf(p), - TypeError); + assert.throws(TypeError, () => Object.getPrototypeOf(p)); rval = true; - assertThrowsInstanceOf(() => Object.getPrototypeOf(p), - TypeError); + assert.throws(TypeError, () => Object.getPrototypeOf(p)); rval = false; - assertThrowsInstanceOf(() => Object.getPrototypeOf(p), - TypeError); + assert.throws(TypeError, () => Object.getPrototypeOf(p)); rval = 0.0; - assertThrowsInstanceOf(() => Object.getPrototypeOf(p), - TypeError); + assert.throws(TypeError, () => Object.getPrototypeOf(p)); rval = -0.0; - assertThrowsInstanceOf(() => Object.getPrototypeOf(p), - TypeError); + assert.throws(TypeError, () => Object.getPrototypeOf(p)); rval = 3.141592654; - assertThrowsInstanceOf(() => Object.getPrototypeOf(p), - TypeError); + assert.throws(TypeError, () => Object.getPrototypeOf(p)); rval = NaN; - assertThrowsInstanceOf(() => Object.getPrototypeOf(p), - TypeError); + assert.throws(TypeError, () => Object.getPrototypeOf(p)); rval = -Infinity; - assertThrowsInstanceOf(() => Object.getPrototypeOf(p), - TypeError); + assert.throws(TypeError, () => Object.getPrototypeOf(p)); rval = "[[Prototype]] FOR REALZ"; - assertThrowsInstanceOf(() => Object.getPrototypeOf(p), - TypeError); + assert.throws(TypeError, () => Object.getPrototypeOf(p)); rval = Symbol("[[Prototype]] FOR REALZ"); - assertThrowsInstanceOf(() => Object.getPrototypeOf(p), - TypeError); + assert.throws(TypeError, () => Object.getPrototypeOf(p)); } returnsPrimitives(); @@ -270,8 +259,7 @@ assert.sameValue(log[0], "act1 again"); act1 = act2 = nop; rval = /a/; -assertThrowsInstanceOf(() => Object.getPrototypeOf(p), - TypeError); +assert.throws(TypeError, () => Object.getPrototypeOf(p)); // 13. Return handlerProto. diff --git a/test/staging/sm/Proxy/ownkeys-allowed-types.js b/test/staging/sm/Proxy/ownkeys-allowed-types.js index 5a196505a5..89a733f10f 100644 --- a/test/staging/sm/Proxy/ownkeys-allowed-types.js +++ b/test/staging/sm/Proxy/ownkeys-allowed-types.js @@ -15,8 +15,8 @@ function makeProxy(type) { for (var type of [123, 12.5, true, false, undefined, null, {}, []]) { var proxy = makeProxy(type); - assertThrowsInstanceOf(() => Object.ownKeys(proxy), TypeError); - assertThrowsInstanceOf(() => Object.getOwnPropertyNames(proxy), TypeError); + assert.throws(TypeError, () => Object.ownKeys(proxy)); + assert.throws(TypeError, () => Object.getOwnPropertyNames(proxy)); } type = Symbol(); diff --git a/test/staging/sm/Proxy/ownkeys-trap-duplicates.js b/test/staging/sm/Proxy/ownkeys-trap-duplicates.js index 9113ce6fee..7d374a11ce 100644 --- a/test/staging/sm/Proxy/ownkeys-trap-duplicates.js +++ b/test/staging/sm/Proxy/ownkeys-trap-duplicates.js @@ -27,11 +27,11 @@ print(BUGNUMBER + ": " + summary); var target = Object.preventExtensions({ a: 1 }); var proxy = new Proxy(target, { ownKeys(t) { return ["a", "a"]; } }); -assertThrowsInstanceOf(() => Object.getOwnPropertyNames(proxy), TypeError); +assert.throws(TypeError, () => Object.getOwnPropertyNames(proxy)); target = Object.freeze({ a: 1 }); proxy = new Proxy(target, { ownKeys(t) { return ["a", "a"]; } }); -assertThrowsInstanceOf(() => Object.getOwnPropertyNames(proxy), TypeError); +assert.throws(TypeError, () => Object.getOwnPropertyNames(proxy)); /******************************************************************************/ diff --git a/test/staging/sm/Proxy/proxy-constructNonObject.js b/test/staging/sm/Proxy/proxy-constructNonObject.js index 998cab17de..85b1029225 100644 --- a/test/staging/sm/Proxy/proxy-constructNonObject.js +++ b/test/staging/sm/Proxy/proxy-constructNonObject.js @@ -18,10 +18,10 @@ function callable() {} var p = new Proxy(callable, handler); -assertThrowsInstanceOf(function () { new p(); }, TypeError, +assert.throws(TypeError, function () { new p(); }, "[[Construct must throw if an object is not returned."); handler.construct = bogusConstructUndefined; -assertThrowsInstanceOf(function () { new p(); }, TypeError, +assert.throws(TypeError, function () { new p(); }, "[[Construct must throw if an object is not returned."); diff --git a/test/staging/sm/Proxy/proxy-no-receiver-overwrite.js b/test/staging/sm/Proxy/proxy-no-receiver-overwrite.js index 3e5725a5db..1ca94e51a3 100644 --- a/test/staging/sm/Proxy/proxy-no-receiver-overwrite.js +++ b/test/staging/sm/Proxy/proxy-no-receiver-overwrite.js @@ -27,6 +27,6 @@ var y = new Proxy({}, { }) // This will invoke [[Set]] on the target, with the proxy as receiver. -assertThrowsInstanceOf(() => y.a = 1, TypeError); -assertThrowsInstanceOf(() => y.b = 2, TypeError); +assert.throws(TypeError, () => y.a = 1); +assert.throws(TypeError, () => y.b = 2); diff --git a/test/staging/sm/Proxy/report-writable-as-non-writable.js b/test/staging/sm/Proxy/report-writable-as-non-writable.js index bb6b83313a..8b40574f6d 100644 --- a/test/staging/sm/Proxy/report-writable-as-non-writable.js +++ b/test/staging/sm/Proxy/report-writable-as-non-writable.js @@ -22,9 +22,7 @@ var proxy = new Proxy(target, { } }); -assertThrowsInstanceOf(() => Object.getOwnPropertyDescriptor(proxy, "test"), - TypeError); +assert.throws(TypeError, () => Object.getOwnPropertyDescriptor(proxy, "test")); -assertThrowsInstanceOf(() => Reflect.getOwnPropertyDescriptor(proxy, "test"), - TypeError); +assert.throws(TypeError, () => Reflect.getOwnPropertyDescriptor(proxy, "test")); diff --git a/test/staging/sm/Proxy/revoke-as-side-effect.js b/test/staging/sm/Proxy/revoke-as-side-effect.js index 44a6566ff3..c88fdd8f0e 100644 --- a/test/staging/sm/Proxy/revoke-as-side-effect.js +++ b/test/staging/sm/Proxy/revoke-as-side-effect.js @@ -57,8 +57,8 @@ assert.sameValue(createProxy({}).a, undefined); assert.sameValue(createProxy({a: 5}).a, 5); // [[Set]] -assertThrowsInstanceOf(() => createProxy({}).a = 0, TypeError); -assertThrowsInstanceOf(() => createProxy({a: 5}).a = 0, TypeError); +assert.throws(TypeError, () => createProxy({}).a = 0); +assert.throws(TypeError, () => createProxy({a: 5}).a = 0); // [[Delete]] assert.sameValue(delete createProxy({}).a, true); @@ -77,6 +77,5 @@ assert.sameValue(createProxy(function() { return "ok" })(), "ok"); // [[ConstructorKind]] is "base" per FunctionAllocate) accesses // |new.target.prototype| to create the |this| for the construct operation, that // would be returned if |return obj;| didn't override it. -assertThrowsInstanceOf(() => new (createProxy(function q(){ return obj; })), - TypeError); +assert.throws(TypeError, () => new (createProxy(function q(){ return obj; }))); diff --git a/test/staging/sm/Proxy/revoked-get-function-realm-typeerror.js b/test/staging/sm/Proxy/revoked-get-function-realm-typeerror.js index 6bd774ff36..25be09de7c 100644 --- a/test/staging/sm/Proxy/revoked-get-function-realm-typeerror.js +++ b/test/staging/sm/Proxy/revoked-get-function-realm-typeerror.js @@ -119,9 +119,9 @@ for (let {constructor, args = []} of constructors) { } }); - assertThrowsInstanceOf(() => { + assert.throws(TypeError, () => { Reflect.construct(constructor, args, proxy); - }, TypeError); + }); assert.sameValue(revoked, 1); } diff --git a/test/staging/sm/Proxy/setPrototypeOf.js b/test/staging/sm/Proxy/setPrototypeOf.js index cf154d18cd..aa2356800e 100644 --- a/test/staging/sm/Proxy/setPrototypeOf.js +++ b/test/staging/sm/Proxy/setPrototypeOf.js @@ -50,45 +50,35 @@ var originalProto = Reflect.getPrototypeOf(p); assert.sameValue(originalProto, Object.prototype); rev.revoke(); -assertThrowsInstanceOf(() => Reflect.setPrototypeOf(p, originalProto), - TypeError); -assertThrowsInstanceOf(() => Reflect.setPrototypeOf(p, null), - TypeError); +assert.throws(TypeError, () => Reflect.setPrototypeOf(p, originalProto)); +assert.throws(TypeError, () => Reflect.setPrototypeOf(p, null)); // 6. Let trap be ? GetMethod(handler, "setPrototypeOf"). // handler has uncallable (and not null/undefined) property p = new Proxy({}, { setPrototypeOf: 9 }); -assertThrowsInstanceOf(() => Reflect.setPrototypeOf(p, null), - TypeError); +assert.throws(TypeError, () => Reflect.setPrototypeOf(p, null)); p = new Proxy({}, { setPrototypeOf: -3.7 }); -assertThrowsInstanceOf(() => Reflect.setPrototypeOf(p, null), - TypeError); +assert.throws(TypeError, () => Reflect.setPrototypeOf(p, null)); p = new Proxy({}, { setPrototypeOf: NaN }); -assertThrowsInstanceOf(() => Reflect.setPrototypeOf(p, null), - TypeError); +assert.throws(TypeError, () => Reflect.setPrototypeOf(p, null)); p = new Proxy({}, { setPrototypeOf: Infinity }); -assertThrowsInstanceOf(() => Reflect.setPrototypeOf(p, null), - TypeError); +assert.throws(TypeError, () => Reflect.setPrototypeOf(p, null)); p = new Proxy({}, { setPrototypeOf: true }); -assertThrowsInstanceOf(() => Reflect.setPrototypeOf(p, null), - TypeError); +assert.throws(TypeError, () => Reflect.setPrototypeOf(p, null)); p = new Proxy({}, { setPrototypeOf: /x/ }); -assertThrowsInstanceOf(() => Reflect.setPrototypeOf(p, null), - TypeError); +assert.throws(TypeError, () => Reflect.setPrototypeOf(p, null)); p = new Proxy({}, { setPrototypeOf: Symbol(42) }); -assertThrowsInstanceOf(() => Reflect.setPrototypeOf(p, null), - TypeError); +assert.throws(TypeError, () => Reflect.setPrototypeOf(p, null)); p = new Proxy({}, { setPrototypeOf: class X {} }); -assertThrowsInstanceOf(() => Reflect.setPrototypeOf(p, null), - TypeError); +assert.throws(TypeError, () => Reflect.setPrototypeOf(p, null)); p = new Proxy({}, observe({})); @@ -251,8 +241,7 @@ var newProto; p = new Proxy(Object.preventExtensions(Object.create(Math)), { setPrototypeOf(t, p) { return true; } }); -assertThrowsInstanceOf(() => Reflect.setPrototypeOf(p, null), - TypeError); +assert.throws(TypeError, () => Reflect.setPrototypeOf(p, null)); // 14. Return true.