From 5f5d06f8614c9ba0ea1d3db54ff1ca5d61c700be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bargull?= Date: Wed, 30 Apr 2025 14:15:41 +0200 Subject: [PATCH] Remove assertThrowsInstanceOfWithMessageCheck from tests --- test/staging/sm/Map/iterator-thisv-error.js | 18 +++---------- .../sm/expressions/inNotObjectError.js | 25 +++++-------------- test/staging/sm/regress/regress-1383630.js | 16 +++--------- test/staging/sm/regress/regress-469625-03.js | 23 +++-------------- test/staging/sm/regress/regress-469758.js | 12 ++++----- test/staging/sm/regress/regress-810525.js | 21 +++------------- 6 files changed, 26 insertions(+), 89 deletions(-) diff --git a/test/staging/sm/Map/iterator-thisv-error.js b/test/staging/sm/Map/iterator-thisv-error.js index 6fdbd49567..299619f9a4 100644 --- a/test/staging/sm/Map/iterator-thisv-error.js +++ b/test/staging/sm/Map/iterator-thisv-error.js @@ -4,25 +4,15 @@ */ /*--- -includes: [sm/non262.js, sm/non262-shell.js] -flags: - - noStrict description: | pending esid: pending ---*/ -function test(fn, thisv) { - assertThrowsInstanceOfWithMessageCheck( - () => fn.call(thisv), - TypeError, - message => - /^\w+ method called on incompatible.+/.test(message) && !message.includes("std_")); -} for (var thisv of [null, undefined, false, true, 0, ""]) { - test(Map.prototype.values, thisv); - test(Map.prototype.keys, thisv); - test(Map.prototype.entries, thisv); - test(Map.prototype[Symbol.iterator], thisv); + assert.throws(TypeError, () => Map.prototype.values.call(thisv)); + assert.throws(TypeError, () => Map.prototype.keys.call(thisv)); + assert.throws(TypeError, () => Map.prototype.entries.call(thisv)); + assert.throws(TypeError, () => Map.prototype[Symbol.iterator].call(thisv)); } diff --git a/test/staging/sm/expressions/inNotObjectError.js b/test/staging/sm/expressions/inNotObjectError.js index 6f3eb2bb19..9e21f12857 100644 --- a/test/staging/sm/expressions/inNotObjectError.js +++ b/test/staging/sm/expressions/inNotObjectError.js @@ -9,29 +9,16 @@ description: | pending esid: pending ---*/ + var BUGNUMBER = 1352429; var summary = 'Error message should provide enough infomation for use of in operator'; -print(BUGNUMBER + ": " + summary); - -function checkErr(substr, str, messageSubstr, messageStr) { - assertThrowsInstanceOfWithMessageCheck( - () => substr in str, - TypeError, - message => - message.includes(messageSubstr) && - message.includes(messageStr) && - message.length < 100, - `"${substr}" in "${str}"` - ); -} - // These test cases check if long string is omitted properly. -checkErr('subString', 'base', 'subString', 'base'); -checkErr('this is subString', 'base', 'this is subStrin...', 'base'); -checkErr('subString', 'this is baseString', 'subString', 'this is baseStri...'); -checkErr('this is subString', 'this is base', 'this is subStrin...', 'this is base'); -checkErr('HEAD' + 'subString'.repeat(30000), 'HEAD' + 'base'.repeat(30000), 'HEADsubStringsub...', 'HEADbasebasebase...'); +assert.throws(TypeError, () => 'subString' in 'base'); +assert.throws(TypeError, () => 'this is subString' in 'base'); +assert.throws(TypeError, () => 'subString' in 'this is baseString'); +assert.throws(TypeError, () => 'this is subString' in 'this is base'); +assert.throws(TypeError, () => 'HEAD' + 'subString'.repeat(30000) in 'HEAD' + 'base'.repeat(30000)); // These test cases check if it does not crash and throws appropriate error. assertThrowsInstanceOf(() => { 1 in 'hello' }, TypeError); diff --git a/test/staging/sm/regress/regress-1383630.js b/test/staging/sm/regress/regress-1383630.js index 32be42c845..ecc5abdba2 100644 --- a/test/staging/sm/regress/regress-1383630.js +++ b/test/staging/sm/regress/regress-1383630.js @@ -5,8 +5,6 @@ /*--- includes: [sm/non262.js, sm/non262-shell.js] -flags: - - noStrict description: | pending esid: pending @@ -24,27 +22,21 @@ esid: pending * proxies, it can be really hard to figure out what little assertion causes a * TypeError in the first place. */ -"use strict"; - -function assertThrowsTypeErrorIncludes(f, propStr, details) { - assertThrowsInstanceOfWithMessageCheck(f, TypeError, - message => message.includes(propStr) && (!details || message.includes(details))); -} const STR = "one", STR_NAME = `"one"`; const SYM = Symbol("two"), SYM_NAME = `'Symbol("two")'`; function errorHasPropertyTests(test) { - assertThrowsTypeErrorIncludes(() => test(STR), STR_NAME); - assertThrowsTypeErrorIncludes(() => test(SYM), SYM_NAME); + assert.throws(TypeError, () => test(STR)); + assert.throws(TypeError, () => test(SYM)); } function errorHasPropertyTestsWithDetails(test) { let [throwable, details] = test(STR); - assertThrowsTypeErrorIncludes(throwable, STR_NAME, details); + assert.throws(TypeError, throwable, details); [throwable, details] = test(SYM); - assertThrowsTypeErrorIncludes(throwable, SYM_NAME, details); + assert.throws(TypeError, throwable, details); } // getOwnPropertyDescriptor diff --git a/test/staging/sm/regress/regress-469625-03.js b/test/staging/sm/regress/regress-469625-03.js index c75d08e35b..e2ed9455cd 100644 --- a/test/staging/sm/regress/regress-469625-03.js +++ b/test/staging/sm/regress/regress-469625-03.js @@ -4,9 +4,6 @@ */ /*--- -includes: [sm/non262.js, sm/non262-shell.js] -flags: - - noStrict description: | pending esid: pending @@ -14,22 +11,8 @@ esid: pending //----------------------------------------------------------------------------- var BUGNUMBER = 469625; var summary = 'Do not assert: script->objectsOffset != 0'; -var actual = ''; -var expect = ''; -//----------------------------------------------------------------------------- -test(); -//----------------------------------------------------------------------------- - -function test() -{ - function f(x) { - var [a, b, [c0, c1]] = [x, x, x]; - } - assertThrowsInstanceOfWithMessageCheck( - () => f(null), - TypeError, - message => /.*\[\.\.\.\]\[Symbol.iterator\]\(\)\.next\(\)\.value is null/.exec(message) !== null - ); +function f(x) { + var [a, b, [c0, c1]] = [x, x, x]; } - +assert.throws(TypeError, () => f(null)); diff --git a/test/staging/sm/regress/regress-469758.js b/test/staging/sm/regress/regress-469758.js index f0c16224f0..23039bcd62 100644 --- a/test/staging/sm/regress/regress-469758.js +++ b/test/staging/sm/regress/regress-469758.js @@ -4,18 +4,16 @@ */ /*--- -includes: [sm/non262.js, sm/non262-shell.js] -flags: - - noStrict description: | pending esid: pending ---*/ -assertThrowsInstanceOfWithMessageCheck( + +assert.throws( + TypeError, () => { {let i=1} {let j=1; [][j][2]} - }, - TypeError, - message => message.endsWith("[][j] is undefined")); + } +); diff --git a/test/staging/sm/regress/regress-810525.js b/test/staging/sm/regress/regress-810525.js index eee7348daf..9376b42cba 100644 --- a/test/staging/sm/regress/regress-810525.js +++ b/test/staging/sm/regress/regress-810525.js @@ -4,26 +4,13 @@ */ /*--- -includes: [sm/non262.js, sm/non262-shell.js] -flags: - - noStrict description: | pending esid: pending ---*/ -var expect = ''; -var actual = ''; -function test(s) { - assertThrowsInstanceOfWithMessageCheck( - () => eval(s), - Error, - message => message.indexOf('(intermediate value)') === -1, - `error message for ${s} should not contain '(intermediate value)'`); -} - -test("({p:1, q:2}).m()"); -test("[].m()"); -test("[1,2,3].m()"); -test("/hi/.m()"); +assert.throws(TypeError, () => eval("({p:1, q:2}).m()")); +assert.throws(TypeError, () => eval("[].m()")); +assert.throws(TypeError, () => eval("[1,2,3].m()")); +assert.throws(TypeError, () => eval("/hi/.m()"));