From 4e71fccb736a407a80777b32d5b292551a712f2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bargull?= Date: Wed, 30 Apr 2025 14:15:47 +0200 Subject: [PATCH] Replace assertThrowsInstanceOf with assert.throws in sm/syntax --- .../syntax/declaration-forbidden-in-label.js | 10 ++++----- .../syntax/escaped-let-static-identifier.js | 18 +++------------- .../syntax/keyword-unescaped-requirement.js | 2 +- test/staging/sm/syntax/let-as-label.js | 16 +++++++------- test/staging/sm/syntax/yield-as-identifier.js | 21 ++++--------------- 5 files changed, 21 insertions(+), 46 deletions(-) diff --git a/test/staging/sm/syntax/declaration-forbidden-in-label.js b/test/staging/sm/syntax/declaration-forbidden-in-label.js index e3643bb726..3689fb6c15 100644 --- a/test/staging/sm/syntax/declaration-forbidden-in-label.js +++ b/test/staging/sm/syntax/declaration-forbidden-in-label.js @@ -23,16 +23,16 @@ print(BUGNUMBER + ": " + summary); * BEGIN TEST * **************/ -assertThrowsInstanceOf(() => Function("a: let x;"), SyntaxError); -assertThrowsInstanceOf(() => Function("b: const y = 3;"), SyntaxError); -assertThrowsInstanceOf(() => Function("c: class z {};"), SyntaxError); +assert.throws(SyntaxError, () => Function("a: let x;")); +assert.throws(SyntaxError, () => Function("b: const y = 3;")); +assert.throws(SyntaxError, () => Function("c: class z {};")); -assertThrowsInstanceOf(() => Function("'use strict'; d: function w() {};"), SyntaxError); +assert.throws(SyntaxError, () => Function("'use strict'; d: function w() {};")); // Annex B.3.2 allows this in non-strict mode code. Function("e: function x() {};"); -assertThrowsInstanceOf(() => Function("f: function* y() {}"), SyntaxError); +assert.throws(SyntaxError, () => Function("f: function* y() {}")); /******************************************************************************/ diff --git a/test/staging/sm/syntax/escaped-let-static-identifier.js b/test/staging/sm/syntax/escaped-let-static-identifier.js index 38c8bd6183..6836b79540 100644 --- a/test/staging/sm/syntax/escaped-let-static-identifier.js +++ b/test/staging/sm/syntax/escaped-let-static-identifier.js @@ -29,22 +29,10 @@ function t(code) var strictSemi = " 'use strict'; " + code; var strictASI = " 'use strict' \n " + code; - var creationFunctions = [Function]; - if (typeof evaluate === "function") - creationFunctions.push(evaluate); - if (typeof parseModule === "function") - creationFunctions.push(parseModule); + Function(code); - for (var func of creationFunctions) - { - if (typeof parseModule === "function" && func === parseModule) - assertThrowsInstanceOf(() => func(code), SyntaxError); - else - func(code); - - assertThrowsInstanceOf(() => func(strictSemi), SyntaxError); - assertThrowsInstanceOf(() => func(strictASI), SyntaxError); - } + assert.throws(SyntaxError, () => Function(strictSemi)); + assert.throws(SyntaxError, () => Function(strictASI)); } t("l\\u0065t: 42;"); diff --git a/test/staging/sm/syntax/keyword-unescaped-requirement.js b/test/staging/sm/syntax/keyword-unescaped-requirement.js index 21c11f8740..2f58b6cf50 100644 --- a/test/staging/sm/syntax/keyword-unescaped-requirement.js +++ b/test/staging/sm/syntax/keyword-unescaped-requirement.js @@ -66,7 +66,7 @@ var badScripts = ]; for (var script of badScripts) - assertThrowsInstanceOf(() => Function(script), SyntaxError); + assert.throws(SyntaxError, () => Function(script)); /******************************************************************************/ diff --git a/test/staging/sm/syntax/let-as-label.js b/test/staging/sm/syntax/let-as-label.js index 9a6f973fea..b9ee98add2 100644 --- a/test/staging/sm/syntax/let-as-label.js +++ b/test/staging/sm/syntax/let-as-label.js @@ -23,17 +23,17 @@ print(BUGNUMBER + ": " + summary); Function("let: 42"); Function("l\\u0065t: 42"); -assertThrowsInstanceOf(() => Function(" 'use strict'; let: 42"), SyntaxError); -assertThrowsInstanceOf(() => Function(" 'use strict' \n let: 42"), SyntaxError); -assertThrowsInstanceOf(() => Function(" 'use strict'; l\\u0065t: 42"), SyntaxError); -assertThrowsInstanceOf(() => Function(" 'use strict' \n l\\u0065t: 42"), SyntaxError); +assert.throws(SyntaxError, () => Function(" 'use strict'; let: 42")); +assert.throws(SyntaxError, () => Function(" 'use strict' \n let: 42")); +assert.throws(SyntaxError, () => Function(" 'use strict'; l\\u0065t: 42")); +assert.throws(SyntaxError, () => Function(" 'use strict' \n l\\u0065t: 42")); eval("let: 42"); eval("l\\u0065t: 42"); -assertThrowsInstanceOf(() => eval(" 'use strict'; let: 42"), SyntaxError); -assertThrowsInstanceOf(() => eval(" 'use strict' \n let: 42;"), SyntaxError); -assertThrowsInstanceOf(() => eval(" 'use strict'; l\\u0065t: 42"), SyntaxError); -assertThrowsInstanceOf(() => eval(" 'use strict' \n l\\u0065t: 42;"), SyntaxError); +assert.throws(SyntaxError, () => eval(" 'use strict'; let: 42")); +assert.throws(SyntaxError, () => eval(" 'use strict' \n let: 42;")); +assert.throws(SyntaxError, () => eval(" 'use strict'; l\\u0065t: 42")); +assert.throws(SyntaxError, () => eval(" 'use strict' \n l\\u0065t: 42;")); /******************************************************************************/ diff --git a/test/staging/sm/syntax/yield-as-identifier.js b/test/staging/sm/syntax/yield-as-identifier.js index c089ca0aee..6d8b0568e5 100644 --- a/test/staging/sm/syntax/yield-as-identifier.js +++ b/test/staging/sm/syntax/yield-as-identifier.js @@ -26,25 +26,12 @@ function t(code) var strictSemi = " 'use strict'; " + code; var strictASI = " 'use strict' \n " + code; - var creationFunctions = ["Function"]; - if (typeof evaluate === "function") - creationFunctions.push("evaluate"); - if (typeof parseModule === "function") - creationFunctions.push("parseModule"); + var g = createNewGlobal(); - for (var func of creationFunctions) - { - var g = createNewGlobal(); - var f = g[func]; + g.Function(code); - if (func === "parseModule") - assertThrowsInstanceOf(() => f(code), g.SyntaxError); - else - f(code); - - assertThrowsInstanceOf(() => f(strictSemi), g.SyntaxError); - assertThrowsInstanceOf(() => f(strictASI), g.SyntaxError); - } + assert.throws(g.SyntaxError, () => g.Function(strictSemi)); + assert.throws(g.SyntaxError, () => g.Function(strictASI)); } t("var yield = 3;");