Replace assertThrowsInstanceOf with assert.throws in sm/syntax

This commit is contained in:
André Bargull 2025-04-30 14:15:47 +02:00 committed by Philip Chimento
parent 11e1fbda5d
commit 4e71fccb73
5 changed files with 21 additions and 46 deletions

View File

@ -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() {}"));
/******************************************************************************/

View File

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

View File

@ -66,7 +66,7 @@ var badScripts =
];
for (var script of badScripts)
assertThrowsInstanceOf(() => Function(script), SyntaxError);
assert.throws(SyntaxError, () => Function(script));
/******************************************************************************/

View File

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

View File

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