test: use assert.match instead of regexp.test

PR-URL: #39928
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Anto Aravinth <anto.aravinth.cse@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Darshan Sen <raisinten@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Zijian Liu <lxxyxzj@gmail.com>

Author: targos

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':

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'$/);

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

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

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

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

test/common/index.js

@@ -547,7 +547,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);

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

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

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