test: migrate message tests to use assertSnapshot

Author: MoLow

test/common/assertSnapshot.js

@@ -8,8 +8,8 @@ const assert = require('node:assert/strict');
 const stackFramesRegexp = /(\s+)((.+?)\s+\()?(?:\(?(.+?):(\d+)(?::(\d+))?)\)?(\s+\{)?(\n|$)/g;
 const windowNewlineRegexp = /\r/g;
 
-function replaceStackTrace(str) {
-  return str.replace(stackFramesRegexp, '$1*$7\n');
+function replaceStackTrace(str, replacement = '$1*$7\n') {
+  return str.replace(stackFramesRegexp, replacement);
 }
 
 function replaceWindowsLineEndings(str) {
@@ -36,11 +36,9 @@ async function assertSnapshot(actual, filename = process.argv[1]) {
 }
 
 async function spawnAndAssert(filename, transform = (x) => x) {
-  // TODO: Add an option to this function to alternatively or additionally compare stderr.
-  // For now, tests that want to check stderr or both stdout and stderr can use spawnPromisified.
   const flags = common.parseTestFlags(filename);
-  const { stdout } = await common.spawnPromisified(process.execPath, [...flags, filename]);
-  await assertSnapshot(transform(stdout), filename);
+  const { stdout, stderr } = await common.spawnPromisified(process.execPath, [...flags, filename]);
+  await assertSnapshot(transform(`${stdout}${stderr}`), filename);
 }
 
 module.exports = {

test/common/index.js

@@ -70,7 +70,7 @@ function parseTestFlags(filename = process.argv[1]) {
   fs.closeSync(fd);
   const source = buffer.toString('utf8', 0, bytesRead);
 
-  const flagStart = source.indexOf('// Flags: --') + 10;
+  const flagStart = source.search(/\/\/ Flags:\s+--/) + 10;
 
   if (flagStart === 9) {
     return [];
@@ -83,7 +83,8 @@ function parseTestFlags(filename = process.argv[1]) {
   return source
     .substring(flagStart, flagEnd)
     .replace(/_/g, '-')
-    .split(' ');
+    .split(/\s+/)
+    .filter(Boolean);
 }
 
 // Check for flags. Skip this for workers (both, the `cluster` module and

test/message/2100bytes.js renamed to test/fixtures/message/2100bytes.js

@@ -20,7 +20,7 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 'use strict';
-require('../common');
+require('../../common');
 
 console.log([
   '_______________________________________________50',

test/message/2100bytes.out renamed to test/fixtures/message/2100bytes.snapshot

@@ -1,9 +1,9 @@
 'use strict';
 
-require('../common');
+require('../../common');
 const { spawnSync } = require('child_process');
 
-const four = require('../common/fixtures')
+const four = require('../../common/fixtures')
   .readSync('async-error.js')
   .toString()
   .split('\n')

test/message/async_error_eval_cjs.js renamed to test/fixtures/message/async_error_eval_cjs.js

@@ -3,4 +3,5 @@ Error: test
     at two ([eval]:15:9)
     at async three ([eval]:18:3)
     at async four ([eval]:22:3)
-    at async main ([eval]:28:5)
+    at async main ([eval]:28:5)
+

test/message/async_error_eval_cjs.out renamed to test/fixtures/message/async_error_eval_cjs.snapshot

@@ -1,9 +1,9 @@
 'use strict';
 
-require('../common');
+require('../../common');
 const { spawnSync } = require('child_process');
 
-const four = require('../common/fixtures')
+const four = require('../../common/fixtures')
   .readSync('async-error.js')
   .toString()
   .split('\n')

test/message/async_error_eval_esm.js renamed to test/fixtures/message/async_error_eval_esm.js

@@ -4,3 +4,4 @@ Error: test
     at async three (file:*/[eval1]:18:3)
     at async four (file:*/[eval1]:22:3)
     at async main (file:*/[eval1]:28:5)
+

test/message/async_error_eval_esm.out renamed to test/fixtures/message/async_error_eval_esm.snapshot

@@ -1,6 +1,6 @@
 'use strict';
-require('../common');
-const four = require('../fixtures/async-error');
+require('../../common');
+const four = require('../async-error');
 
 async function main() {
   try {

test/message/async_error_microtask_main.js renamed to test/fixtures/message/async_error_microtask_main.js

@@ -3,4 +3,4 @@ Error: test
     at two (*fixtures*async-error.js:17:9)
     at async three (*fixtures*async-error.js:20:3)
     at async four (*fixtures*async-error.js:24:3)
-    at async main (*message*async_error_sync_main.js:7:5)
+    at async main (*fixtures*message*async_error_microtask_main.js:7:5)