Replace assertThrowsInstanceOf with assert.throws in sm/Proxy

test/staging/sm/Proxy/define-writable-as-non-writable.js

@@ -21,9 +21,7 @@ var proxy = new Proxy(target, {
     }
 });
 
-assertThrowsInstanceOf(
+assert.throws(TypeError, () => Object.defineProperty(proxy, "test", {writable: false}));
-    () => Object.defineProperty(proxy, "test", {writable: false}), TypeError);
 
-assertThrowsInstanceOf(
+assert.throws(TypeError, () => Reflect.defineProperty(proxy, "test", {writable: false}));
-    () => Reflect.defineProperty(proxy, "test", {writable: false}), TypeError);
 

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);
+assert.throws(TypeError, () => { delete proxy.test; });
-assertThrowsInstanceOf(() => Reflect.deleteProperty(proxy, "test"), TypeError);
+assert.throws(TypeError, () => Reflect.deleteProperty(proxy, "test"));
 

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),
+assert.throws(TypeError, () => Object.getPrototypeOf(p));
-                       TypeError);
 
 // 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),
+  assert.throws(TypeError, () => Object.getPrototypeOf(p));
-                         TypeError);
 
   rval = true;
-  assertThrowsInstanceOf(() => Object.getPrototypeOf(p),
+  assert.throws(TypeError, () => Object.getPrototypeOf(p));
-                         TypeError);
 
   rval = false;
-  assertThrowsInstanceOf(() => Object.getPrototypeOf(p),
+  assert.throws(TypeError, () => Object.getPrototypeOf(p));
-                         TypeError);
 
   rval = 0.0;
-  assertThrowsInstanceOf(() => Object.getPrototypeOf(p),
+  assert.throws(TypeError, () => Object.getPrototypeOf(p));
-                         TypeError);
 
   rval = -0.0;
-  assertThrowsInstanceOf(() => Object.getPrototypeOf(p),
+  assert.throws(TypeError, () => Object.getPrototypeOf(p));
-                         TypeError);
 
   rval = 3.141592654;
-  assertThrowsInstanceOf(() => Object.getPrototypeOf(p),
+  assert.throws(TypeError, () => Object.getPrototypeOf(p));
-                         TypeError);
 
   rval = NaN;
-  assertThrowsInstanceOf(() => Object.getPrototypeOf(p),
+  assert.throws(TypeError, () => Object.getPrototypeOf(p));
-                         TypeError);
 
   rval = -Infinity;
-  assertThrowsInstanceOf(() => Object.getPrototypeOf(p),
+  assert.throws(TypeError, () => Object.getPrototypeOf(p));
-                         TypeError);
 
   rval = "[[Prototype]] FOR REALZ";
-  assertThrowsInstanceOf(() => Object.getPrototypeOf(p),
+  assert.throws(TypeError, () => Object.getPrototypeOf(p));
-                         TypeError);
 
   rval = Symbol("[[Prototype]] FOR REALZ");
-  assertThrowsInstanceOf(() => Object.getPrototypeOf(p),
+  assert.throws(TypeError, () => Object.getPrototypeOf(p));
-                         TypeError);
 }
 
 returnsPrimitives();
@@ -270,8 +259,7 @@ assert.sameValue(log[0], "act1 again");
 
 act1 = act2 = nop;
 rval = /a/;
-assertThrowsInstanceOf(() => Object.getPrototypeOf(p),
+assert.throws(TypeError, () => Object.getPrototypeOf(p));
-                       TypeError);
 
 // 13. Return handlerProto.
 

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);
+    assert.throws(TypeError, () => Object.ownKeys(proxy));
-    assertThrowsInstanceOf(() => Object.getOwnPropertyNames(proxy), TypeError);
+    assert.throws(TypeError, () => Object.getOwnPropertyNames(proxy));
 }
 
 type = Symbol();

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));
 
 /******************************************************************************/
 

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.");
 

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);
+assert.throws(TypeError, () => y.a = 1);
-assertThrowsInstanceOf(() => y.b = 2, TypeError);
+assert.throws(TypeError, () => y.b = 2);
 

test/staging/sm/Proxy/report-writable-as-non-writable.js

@@ -22,9 +22,7 @@ var proxy = new Proxy(target, {
     }
 });
 
-assertThrowsInstanceOf(() => Object.getOwnPropertyDescriptor(proxy, "test"),
+assert.throws(TypeError, () => Object.getOwnPropertyDescriptor(proxy, "test"));
-                       TypeError);
 
-assertThrowsInstanceOf(() => Reflect.getOwnPropertyDescriptor(proxy, "test"),
+assert.throws(TypeError, () => Reflect.getOwnPropertyDescriptor(proxy, "test"));
-                       TypeError);
 

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);
+assert.throws(TypeError, () => createProxy({}).a = 0);
-assertThrowsInstanceOf(() => createProxy({a: 5}).a = 0, TypeError);
+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; })),
+assert.throws(TypeError, () => new (createProxy(function q(){ return obj; })));
-                       TypeError);
 

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);
 }

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),
+assert.throws(TypeError, () => Reflect.setPrototypeOf(p, originalProto));
-                       TypeError);
+assert.throws(TypeError, () => Reflect.setPrototypeOf(p, null));
-assertThrowsInstanceOf(() => Reflect.setPrototypeOf(p, null),
-                       TypeError);
 
 // 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),
+assert.throws(TypeError, () => Reflect.setPrototypeOf(p, null));
-                       TypeError);
 
 p = new Proxy({}, { setPrototypeOf: -3.7 });
-assertThrowsInstanceOf(() => Reflect.setPrototypeOf(p, null),
+assert.throws(TypeError, () => Reflect.setPrototypeOf(p, null));
-                       TypeError);
 
 p = new Proxy({}, { setPrototypeOf: NaN });
-assertThrowsInstanceOf(() => Reflect.setPrototypeOf(p, null),
+assert.throws(TypeError, () => Reflect.setPrototypeOf(p, null));
-                       TypeError);
 
 p = new Proxy({}, { setPrototypeOf: Infinity });
-assertThrowsInstanceOf(() => Reflect.setPrototypeOf(p, null),
+assert.throws(TypeError, () => Reflect.setPrototypeOf(p, null));
-                       TypeError);
 
 p = new Proxy({}, { setPrototypeOf: true });
-assertThrowsInstanceOf(() => Reflect.setPrototypeOf(p, null),
+assert.throws(TypeError, () => Reflect.setPrototypeOf(p, null));
-                       TypeError);
 
 p = new Proxy({}, { setPrototypeOf: /x/ });
-assertThrowsInstanceOf(() => Reflect.setPrototypeOf(p, null),
+assert.throws(TypeError, () => Reflect.setPrototypeOf(p, null));
-                       TypeError);
 
 p = new Proxy({}, { setPrototypeOf: Symbol(42) });
-assertThrowsInstanceOf(() => Reflect.setPrototypeOf(p, null),
+assert.throws(TypeError, () => Reflect.setPrototypeOf(p, null));
-                       TypeError);
 
 p = new Proxy({}, { setPrototypeOf: class X {} });
-assertThrowsInstanceOf(() => Reflect.setPrototypeOf(p, null),
+assert.throws(TypeError, () => Reflect.setPrototypeOf(p, null));
-                       TypeError);
 
 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),
+assert.throws(TypeError, () => Reflect.setPrototypeOf(p, null));
-                       TypeError);
 
 // 14. Return true.