test: use assert.match instead of regexp.test

PR-URL: #39928 Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Anto Aravinth <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Darshan Sen <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Zijian Liu <[email protected]>
nodejs · Aug 31, 2021 · 508890d · 508890d
1 parent 162f07b
commit 508890d
Show file tree

Hide file tree

Showing 98 changed files with 260 additions and 260 deletions.
diff --git a/test/abort/test-addon-uv-handle-leak.js b/test/abort/test-addon-uv-handle-leak.js
@@ -90,23 +90,23 @@ if (process.argv[2] === 'child') {
 
     switch (state) {
       case 'initial':
-        assert(/^uv loop at \[.+\] has open handles:$/.test(line), line);
+        assert.match(line, /^uv loop at \[.+\] has open handles:$/);
         state = 'handle-start';
         break;
       case 'handle-start':
         if (/^uv loop at \[.+\] has \d+ open handles in total$/.test(line)) {
           state = 'assertion-failure';
           break;
         }
-        assert(/^\[.+\] timer( \(active\))?$/.test(line), line);
+        assert.match(line, /^\[.+\] timer( \(active\))?$/);
         state = 'close-callback';
         break;
       case 'close-callback':
-        assert(/^Close callback:/.test(line), line);
+        assert.match(line, /^Close callback:/);
         state = 'data';
         break;
       case 'data':
-        assert(/^Data: .+$/.test(line), line);
+        assert.match(line, /^Data: .+$/);
         state = 'maybe-first-field';
         break;
       case 'maybe-first-field':
@@ -116,7 +116,7 @@ if (process.argv[2] === 'child') {
         state = 'handle-start';
         break;
       case 'assertion-failure':
-        assert(/Assertion .+ failed/.test(line), line);
+        assert.match(line, /Assertion .+ failed/);
         state = 'done';
         break;
       case 'done':

diff --git a/test/addons/errno-exception/test.js b/test/addons/errno-exception/test.js
@@ -12,4 +12,4 @@ const err = binding.errno();
 assert.strictEqual(err.syscall, 'syscall');
 assert.strictEqual(err.errno, 10);
 assert.strictEqual(err.path, 'päth');
-assert.ok(/^Error:\s\w+, some error msg 'päth'$/.test(err.toString()));
+assert.match(err.toString(), /^Error:\s\w+, some error msg 'päth'$/);
diff --git a/test/async-hooks/test-emit-after-on-destroyed.js b/test/async-hooks/test-emit-after-on-destroyed.js
@@ -54,11 +54,11 @@ if (process.argv[2] === 'child') {
 
   child.on('close', common.mustCall((code) => {
     assert.strictEqual(code, 1);
-    assert.ok(heartbeatMsg.test(outData.toString()),
-              'did not crash until we reached offending line of code ' +
-              `(found ${outData})`);
-    assert.ok(corruptedMsg.test(errData.toString()),
-              'printed error contains corrupted message ' +
-              `(found ${errData})`);
+    assert.match(outData.toString(), heartbeatMsg,
+                 'did not crash until we reached offending line of code ' +
+                 `(found ${outData})`);
+    assert.match(errData.toString(), corruptedMsg,
+                 'printed error contains corrupted message ' +
+                 `(found ${errData})`);
   }));
 }
diff --git a/test/async-hooks/test-emit-before-on-destroyed.js b/test/async-hooks/test-emit-before-on-destroyed.js
@@ -54,11 +54,11 @@ if (process.argv[2] === 'child') {
 
   child.on('close', common.mustCall((code) => {
     assert.strictEqual(code, 1);
-    assert.ok(heartbeatMsg.test(outData.toString()),
-              'did not crash until we reached offending line of code ' +
-              `(found ${outData})`);
-    assert.ok(corruptedMsg.test(errData.toString()),
-              'printed error contains corrupted message ' +
-              `(found ${errData})`);
+    assert.match(outData.toString(), heartbeatMsg,
+                 'did not crash until we reached offending line of code ' +
+                 `(found ${outData})`);
+    assert.match(errData.toString(), corruptedMsg,
+                 'printed error contains corrupted message ' +
+                 `(found ${errData})`);
   }));
 }
diff --git a/test/async-hooks/test-improper-order.js b/test/async-hooks/test-improper-order.js
@@ -53,11 +53,11 @@ if (process.argv[2] === 'child') {
 
   child.on('close', common.mustCall((code) => {
     assert.strictEqual(code, 1);
-    assert.ok(heartbeatMsg.test(outData.toString()),
-              'did not crash until we reached offending line of code ' +
-              `(found ${outData})`);
-    assert.ok(corruptedMsg.test(errData.toString()),
-              'printed error contains corrupted message ' +
-              `(found ${errData})`);
+    assert.match(outData.toString(), heartbeatMsg,
+                 'did not crash until we reached offending line of code ' +
+                 `(found ${outData})`);
+    assert.match(errData.toString(), corruptedMsg,
+                 'printed error contains corrupted message ' +
+                 `(found ${errData})`);
   }));
 }
diff --git a/test/async-hooks/test-improper-unwind.js b/test/async-hooks/test-improper-unwind.js
@@ -57,11 +57,11 @@ if (process.argv[2] === 'child') {
 
   child.on('close', common.mustCall((code) => {
     assert.strictEqual(code, 1);
-    assert.ok(heartbeatMsg.test(outData.toString()),
-              'did not crash until we reached offending line of code ' +
-              `(found ${outData})`);
-    assert.ok(corruptedMsg.test(errData.toString()),
-              'printed error contains corrupted message ' +
-              `(found ${errData})`);
+    assert.match(outData.toString(), heartbeatMsg,
+                 'did not crash until we reached offending line of code ' +
+                 `(found ${outData})`);
+    assert.match(errData.toString(), corruptedMsg,
+                 'printed error contains corrupted message ' +
+                 `(found ${errData})`);
   }));
 }
diff --git a/test/common/index.js b/test/common/index.js
@@ -554,7 +554,7 @@ function _expectWarning(name, expected, code) {
     if (typeof message === 'string') {
       assert.strictEqual(warning.message, message);
     } else {
-      assert(message.test(warning.message));
+      assert.match(warning.message, message);
     }
     assert.strictEqual(warning.code, code);
   }, expected.length);

diff --git a/test/common/report.js b/test/common/report.js
@@ -146,7 +146,7 @@ function _validateContent(report, fields = []) {
   header.networkInterfaces.forEach((iface) => {
     assert.strictEqual(typeof iface.name, 'string');
     assert.strictEqual(typeof iface.internal, 'boolean');
-    assert(/^([0-9A-F][0-9A-F]:){5}[0-9A-F]{2}$/i.test(iface.mac));
+    assert.match(iface.mac, /^([0-9A-F][0-9A-F]:){5}[0-9A-F]{2}$/i);
 
     if (iface.family === 'IPv4') {
       assert.strictEqual(net.isIPv4(iface.address), true);
@@ -171,7 +171,7 @@ function _validateContent(report, fields = []) {
     assert(typeof frame === 'object' && frame !== null);
     checkForUnknownFields(frame, ['pc', 'symbol']);
     assert.strictEqual(typeof frame.pc, 'string');
-    assert(/^0x[0-9a-f]+$/.test(frame.pc));
+    assert.match(frame.pc, /^0x[0-9a-f]+$/);
     assert.strictEqual(typeof frame.symbol, 'string');
   });
 
@@ -250,7 +250,7 @@ function _validateContent(report, fields = []) {
   report.libuv.forEach((resource) => {
     assert.strictEqual(typeof resource.type, 'string');
     assert.strictEqual(typeof resource.address, 'string');
-    assert(/^0x[0-9a-f]+$/.test(resource.address));
+    assert.match(resource.address, /^0x[0-9a-f]+$/);
     assert.strictEqual(typeof resource.is_active, 'boolean');
     assert.strictEqual(typeof resource.is_referenced,
                        resource.type === 'loop' ? 'undefined' : 'boolean');

diff --git a/test/internet/test-dns-ipv6.js b/test/internet/test-dns-ipv6.js
@@ -142,7 +142,7 @@ TEST(function test_lookup_ipv6_hint(done) {
         assert(err instanceof Error);
         assert.strictEqual(err.code, 'EAI_BADFLAGS');
         assert.strictEqual(err.hostname, addresses.INET_HOST);
-        assert.ok(/getaddrinfo EAI_BADFLAGS/.test(err.message));
+        assert.match(err.message, /getaddrinfo EAI_BADFLAGS/);
         done();
         return;
       }

diff --git a/test/internet/test-dns.js b/test/internet/test-dns.js
@@ -527,7 +527,7 @@ TEST(function test_lookup_failure(done) {
     assert.ok(err instanceof Error);
     assert.strictEqual(err.code, dns.NOTFOUND);
     assert.strictEqual(err.code, 'ENOTFOUND');
-    assert.ok(!/ENOENT/.test(err.message));
+    assert.doesNotMatch(err.message, !/ENOENT/);
     assert.ok(err.message.includes(addresses.NOT_FOUND));
 
     done();
@@ -640,7 +640,7 @@ TEST(function test_lookupservice_invalid(done) {
   const req = dns.lookupService('1.2.3.4', 80, (err) => {
     assert(err instanceof Error);
     assert.strictEqual(err.code, 'ENOTFOUND');
-    assert.ok(/1\.2\.3\.4/.test(err.message));
+    assert.match(err.message, /1\.2\.3\.4/);
 
     done();
   });
@@ -662,7 +662,7 @@ TEST(function test_reverse_failure(done) {
     assert(err instanceof Error);
     assert.strictEqual(err.code, 'ENOTFOUND');  // Silly error code...
     assert.strictEqual(err.hostname, '203.0.113.0');
-    assert.ok(/203\.0\.113\.0/.test(err.message));
+    assert.match(err.message, /203\.0\.113\.0/);
 
     done();
   });

diff --git a/test/internet/test-inspector-help-page.js b/test/internet/test-inspector-help-page.js
@@ -28,7 +28,7 @@ function check(url, cb) {
     });
 
     res.on('end', common.mustCall(() => {
-      assert(/>Debugging Guide</.test(result));
+      assert.match(result, />Debugging Guide</);
       cb();
     }));
   })).on('error', common.mustNotCall);

diff --git a/test/parallel/test-assert-async.js b/test/parallel/test-assert-async.js
@@ -136,7 +136,7 @@ promises.push(assert.rejects(
     assert.strictEqual(err.code, 'ERR_ASSERTION');
     assert.strictEqual(err.actual, actual);
     assert.strictEqual(err.operator, 'rejects');
-    assert(/rejects/.test(err.stack));
+    assert.match(err.stack, /rejects/);
     return true;
   };
   const err = new Error();

diff --git a/test/parallel/test-assert.js b/test/parallel/test-assert.js
@@ -1246,7 +1246,7 @@ assert.throws(
     assert.deepStrictEqual(Array(100).fill(1), 'foobar');
   } catch (err) {
     threw = true;
-    assert(/actual: \[Array],\n  expected: 'foobar',/.test(inspect(err)));
+    assert.match(inspect(err), /actual: \[Array],\n  expected: 'foobar',/);
   }
   assert(threw);
 }

diff --git a/test/parallel/test-async-wrap-pop-id-during-load.js b/test/parallel/test-async-wrap-pop-id-during-load.js
@@ -21,5 +21,5 @@ const ret = spawnSync(
 assert.strictEqual(ret.status, 0,
                    `EXIT CODE: ${ret.status}, STDERR:\n${ret.stderr}`);
 const stderr = ret.stderr.toString('utf8', 0, 2048);
-assert.ok(!/async.*hook/i.test(stderr));
+assert.doesNotMatch(stderr, /async.*hook/i);
 assert.ok(stderr.includes('Maximum call stack size exceeded'), stderr);
diff --git a/test/parallel/test-buffer-prototype-inspect.js b/test/parallel/test-buffer-prototype-inspect.js
@@ -19,5 +19,5 @@ const util = require('util');
 
 {
   const buf = Buffer.from('x'.repeat(51));
-  assert.ok(/^<Buffer (?:78 ){50}\.\.\. 1 more byte>$/.test(util.inspect(buf)));
+  assert.match(util.inspect(buf), /^<Buffer (?:78 ){50}\.\.\. 1 more byte>$/);
 }
diff --git a/test/parallel/test-cli-syntax-piped-bad.js b/test/parallel/test-cli-syntax-piped-bad.js
@@ -29,7 +29,7 @@ syntaxArgs.forEach(function(arg) {
   assert.strictEqual(c.stdout, '');
 
   // stderr should have a syntax error message
-  assert(syntaxErrorRE.test(c.stderr), `${syntaxErrorRE} === ${c.stderr}`);
+  assert.match(c.stderr, syntaxErrorRE);
 
   assert.strictEqual(c.status, 1);
 });
@@ -50,7 +50,7 @@ syntaxArgs.forEach(function(arg) {
   assert.strictEqual(c.stdout, '');
 
   // stderr should have a syntax error message
-  assert(syntaxErrorRE.test(c.stderr), `${syntaxErrorRE} === ${c.stderr}`);
+  assert.match(c.stderr, syntaxErrorRE);
 
   assert.strictEqual(c.status, 1);
 });
diff --git a/test/parallel/test-cluster-fork-windowsHide.js b/test/parallel/test-cluster-fork-windowsHide.js
@@ -23,7 +23,7 @@ if (!process.argv[2]) {
     workerOnline: common.mustCall((msg) => {
     }),
     mainWindowHandle: common.mustCall((msg) => {
-      assert.ok(/0\s*/.test(msg.value));
+      assert.match(msg.value, /0\s*/);
     }),
     workerExit: common.mustCall((msg) => {
       assert.strictEqual(msg.code, 0);

diff --git a/test/parallel/test-common.js b/test/parallel/test-common.js
@@ -34,7 +34,7 @@ const { join } = require('path');
   const p = fixtures.path('leakedGlobal.js');
   execFile(process.execPath, [p], common.mustCall((err, stdout, stderr) => {
     assert.notStrictEqual(err.code, 0);
-    assert.ok(/\bAssertionError\b.*\bUnexpected global\b.*\bgc\b/.test(stderr));
+    assert.match(stderr, /\bAssertionError\b.*\bUnexpected global\b.*\bgc\b/);
   }));
 }
 
@@ -130,7 +130,7 @@ const HIJACK_TEST_ARRAY = [ 'foo\n', 'bar\n', 'baz\n' ];
 // Test `tmpdir`.
 {
   tmpdir.refresh();
-  assert.ok(/\.tmp\.\d+/.test(tmpdir.path));
+  assert.match(tmpdir.path, /\.tmp\.\d+/);
   const sentinelPath = join(tmpdir.path, 'gaga');
   writeFileSync(sentinelPath, 'googoo');
   tmpdir.refresh();

diff --git a/test/parallel/test-console.js b/test/parallel/test-console.js
@@ -246,24 +246,27 @@ assert.ok(strings[0].includes('foo: { bar: { baz:'));
 assert.ok(strings[0].includes('quux'));
 assert.ok(strings.shift().includes('quux: true'));
 
-assert.ok(/^label: \d+(\.\d{1,3})?(ms|s)$/.test(strings.shift().trim()));
-assert.ok(/^__proto__: \d+(\.\d{1,3})?(ms|s)$/.test(strings.shift().trim()));
-assert.ok(/^constructor: \d+(\.\d{1,3})?(ms|s)$/.test(strings.shift().trim()));
-assert.ok(/^hasOwnProperty: \d+(\.\d{1,3})?(ms|s)$/.test(strings.shift().trim()));
+assert.match(strings.shift().trim(), /^label: \d+(\.\d{1,3})?(ms|s)$/);
+assert.match(strings.shift().trim(), /^__proto__: \d+(\.\d{1,3})?(ms|s)$/);
+assert.match(strings.shift().trim(), /^constructor: \d+(\.\d{1,3})?(ms|s)$/);
+assert.match(strings.shift().trim(), /^hasOwnProperty: \d+(\.\d{1,3})?(ms|s)$/);
 
 // Verify that console.time() coerces label values to strings as expected
-assert.ok(/^: \d+(\.\d{1,3})?(ms|s)$/.test(strings.shift().trim()));
-assert.ok(/^\[object Object\]: \d+(\.\d{1,3})?(ms|s)$/.test(strings.shift().trim()));
-assert.ok(/^\[object Object\]: \d+(\.\d{1,3})?(ms|s)$/.test(strings.shift().trim()));
-assert.ok(/^null: \d+(\.\d{1,3})?(ms|s)$/.test(strings.shift().trim()));
-assert.ok(/^default: \d+(\.\d{1,3})?(ms|s)$/.test(strings.shift().trim()));
-assert.ok(/^default: \d+(\.\d{1,3})?(ms|s)$/.test(strings.shift().trim()));
-assert.ok(/^NaN: \d+(\.\d{1,3})?(ms|s)$/.test(strings.shift().trim()));
-
-assert.ok(/^log1: \d+(\.\d{1,3})?(ms|s)$/.test(strings.shift().trim()));
-assert.ok(/^log1: \d+(\.\d{1,3})?(ms|s) test$/.test(strings.shift().trim()));
-assert.ok(/^log1: \d+(\.\d{1,3})?(ms|s) {} \[ 1, 2, 3 ]$/.test(strings.shift().trim()));
-assert.ok(/^log1: \d+(\.\d{1,3})?(ms|s)$/.test(strings.shift().trim()));
+assert.match(strings.shift().trim(), /^: \d+(\.\d{1,3})?(ms|s)$/);
+assert.match(strings.shift().trim(),
+             /^\[object Object\]: \d+(\.\d{1,3})?(ms|s)$/);
+assert.match(strings.shift().trim(),
+             /^\[object Object\]: \d+(\.\d{1,3})?(ms|s)$/);
+assert.match(strings.shift().trim(), /^null: \d+(\.\d{1,3})?(ms|s)$/);
+assert.match(strings.shift().trim(), /^default: \d+(\.\d{1,3})?(ms|s)$/);
+assert.match(strings.shift().trim(), /^default: \d+(\.\d{1,3})?(ms|s)$/);
+assert.match(strings.shift().trim(), /^NaN: \d+(\.\d{1,3})?(ms|s)$/);
+
+assert.match(strings.shift().trim(), /^log1: \d+(\.\d{1,3})?(ms|s)$/);
+assert.match(strings.shift().trim(), /^log1: \d+(\.\d{1,3})?(ms|s) test$/);
+assert.match(strings.shift().trim(),
+             /^log1: \d+(\.\d{1,3})?(ms|s) {} \[ 1, 2, 3 ]$/);
+assert.match(strings.shift().trim(), /^log1: \d+(\.\d{1,3})?(ms|s)$/);
 
 // Make sure that we checked all strings
 assert.strictEqual(strings.length, 0);