test: migrate message tests to use assertSnapshot

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 → 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/async_error_eval_cjs.js → test/fixtures/message/async_error_eval_cjs.js

@@ -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.out → test/fixtures/message/async_error_eval_cjs.snapshot

@@ -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_esm.js → test/fixtures/message/async_error_eval_esm.js

@@ -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.out → test/fixtures/message/async_error_eval_esm.snapshot

@@ -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_microtask_main.js → test/fixtures/message/async_error_microtask_main.js

@@ -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_sync_main.out → test/fixtures/message/async_error_microtask_main.snapshot

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

test/message/async_error_nexttick_main.js → test/fixtures/message/async_error_nexttick_main.js

@@ -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_nexttick_main.out → test/fixtures/message/async_error_nexttick_main.snapshot

@@ -1,7 +1,7 @@
 Error: test
     at one (*fixtures*async-error.js:4:9)
     at two (*fixtures*async-error.js:17:9)
-    at process.processTicksAndRejections (node:internal/process/task_queues:*:*)
+    at process.processTicksAndRejections (node:internal*process*task_queues:95:5)
     at async three (*fixtures*async-error.js:20:3)
     at async four (*fixtures*async-error.js:24:3)
-    at async main (*message*async_error_nexttick_main.js:7:5)
+    at async main (*fixtures*message*async_error_nexttick_main.js:7:5)

test/message/async_error_sync_esm.mjs → test/fixtures/message/async_error_sync_esm.mjs

@@ -1,5 +1,5 @@
-import '../common/index.mjs';
-import four from '../fixtures/async-error.js';
+import '../../common/index.mjs';
+import four from '../async-error.js';
 
 async function main() {
   try {

test/message/async_error_microtask_main.out → test/fixtures/message/async_error_sync_esm.snapshot

@@ -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_microtask_main.js:7:5)
+    at async main (file:**fixtures*message*async_error_sync_esm.mjs:6:5)

test/message/async_error_sync_main.js → test/fixtures/message/async_error_sync_main.js

@@ -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_sync_esm.out → test/fixtures/message/async_error_sync_main.snapshot

@@ -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_esm.mjs:6:5)
+    at async main (*fixtures*message*async_error_sync_main.js:7:5)

test/message/console.js → test/fixtures/message/console.js

@@ -1,5 +1,5 @@
 'use strict';
 
-require('../common');
+require('../../common');
 
 console.trace('foo');

test/message/console.out → test/fixtures/message/console.snapshot

@@ -1,5 +1,5 @@
 Trace: foo
-    at Object.<anonymous> (*console.js:*:*)
+    at *
     at *
     at *
     at *

test/message/console_low_stack_space.js → test/fixtures/message/console_low_stack_space.js

@@ -7,7 +7,7 @@ Object.defineProperty(global, 'console', {
   value: {},
 });
 
-require('../common');
+require('../../common');
 
 // This test checks that, if Node cannot put together the `console` object
 // because it is low on stack space while doing so, it can succeed later

test/message/error_aggregateTwoErrors.js → test/fixtures/message/error_aggregateTwoErrors.js

@@ -1,7 +1,7 @@
 // Flags: --expose-internals
 'use strict';
 
-require('../common');
+require('../../common');
 Error.stackTraceLimit = 1;
 
 const { aggregateTwoErrors } = require('internal/errors');

test/message/error_aggregateTwoErrors.out → test/fixtures/message/error_aggregateTwoErrors.snapshot

@@ -1,15 +1,16 @@
 *error_aggregateTwoErrors.js:*
 throw aggregateTwoErrors(err, originalError);
 ^
+
 [AggregateError: original] {
   code: 'ERR0',
   [errors]: [
     Error: original
-        at Object.<anonymous> (*test*message*error_aggregateTwoErrors.js:*:*) {
+        at Object.<anonymous> (*error_aggregateTwoErrors.js:*:*) {
       code: 'ERR0'
     },
     Error: second error
-        at Object.<anonymous> (*test*message*error_aggregateTwoErrors.js:*:*) {
+        at Object.<anonymous> (*error_aggregateTwoErrors.js:*:*) {
       code: 'ERR1'
     }
   ]

test/message/error_exit.js → test/fixtures/message/error_exit.js

@@ -20,7 +20,7 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 'use strict';
-require('../common');
+require('../../common');
 Error.stackTraceLimit = 1;
 
 const assert = require('assert');

test/message/error_exit.out → test/fixtures/message/error_exit.snapshot

@@ -7,7 +7,7 @@ AssertionError [ERR_ASSERTION]: Expected values to be strictly equal:
 
 1 !== 2
 
-    at Object.<anonymous> (*test*message*error_exit.js:*:*) {
+    at Object.<anonymous> (*error_exit.js:*:*) {
   generatedMessage: true,
   code: 'ERR_ASSERTION',
   actual: 1,

test/message/error_with_nul.js → test/fixtures/message/error_with_nul.js

@@ -1,5 +1,5 @@
 'use strict';
-require('../common');
+require('../../common');
 Error.stackTraceLimit = 2;
 
 function test() {

test/message/events_unhandled_error_common_trace.js → test/fixtures/message/events_unhandled_error_common_trace.js

@@ -1,5 +1,5 @@
 'use strict';
-require('../common');
+require('../../common');
 Error.stackTraceLimit = 2;
 
 const EventEmitter = require('events');

test/message/events_unhandled_error_common_trace.out → test/fixtures/message/events_unhandled_error_common_trace.snapshot

@@ -1,5 +1,5 @@
 node:events:*
-      throw er; // Unhandled 'error' event
+      throw er; * Unhandled 'error' event
       ^
 
 Error: foo:bar

test/message/events_unhandled_error_nexttick.js → test/fixtures/message/events_unhandled_error_nexttick.js

@@ -1,5 +1,5 @@
 'use strict';
-require('../common');
+require('../../common');
 Error.stackTraceLimit = 1;
 
 const EventEmitter = require('events');

test/message/events_unhandled_error_nexttick.out → test/fixtures/message/events_unhandled_error_nexttick.snapshot

@@ -1,5 +1,5 @@
 node:events:*
-      throw er; // Unhandled 'error' event
+      throw er; * Unhandled 'error' event
       ^
 
 Error

test/message/events_unhandled_error_sameline.js → test/fixtures/message/events_unhandled_error_sameline.js

@@ -1,5 +1,5 @@
 'use strict';
-require('../common');
+require('../../common');
 Error.stackTraceLimit = 1;
 
 const EventEmitter = require('events');

test/message/events_unhandled_error_sameline.out → test/fixtures/message/events_unhandled_error_sameline.snapshot

@@ -1,5 +1,5 @@
 node:events:*
-      throw er; // Unhandled 'error' event
+      throw er; * Unhandled 'error' event
       ^
 
 Error

test/message/events_unhandled_error_subclass.js → test/fixtures/message/events_unhandled_error_subclass.js

@@ -1,5 +1,5 @@
 'use strict';
-require('../common');
+require('../../common');
 Error.stackTraceLimit = 1;
 
 const EventEmitter = require('events');

test/message/events_unhandled_error_subclass.out → test/fixtures/message/events_unhandled_error_subclass.snapshot

@@ -1,5 +1,5 @@
 node:events:*
-      throw er; // Unhandled 'error' event
+      throw er; * Unhandled 'error' event
       ^
 
 Error

test/message/hello_world.js → test/fixtures/message/hello_world.js

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

test/message/source_map_disabled_by_api.js → test/fixtures/message/source_map_disabled_by_api.js

@@ -1,25 +1,25 @@
 // Flags: --enable-source-maps
 
 'use strict';
-require('../common');
+require('../../common');
 Error.stackTraceLimit = 5;
 
 process.setSourceMapsEnabled(false);
 
 try {
-  require('../fixtures/source-map/enclosing-call-site-min.js');
+  require('../source-map/enclosing-call-site-min.js');
 } catch (e) {
   console.log(e);
 }
 
 delete require.cache[require
-  .resolve('../fixtures/source-map/enclosing-call-site-min.js')];
+  .resolve('../source-map/enclosing-call-site-min.js')];
 
 // Re-enable.
 process.setSourceMapsEnabled(true);
 
 try {
-  require('../fixtures/source-map/enclosing-call-site-min.js');
+  require('../source-map/enclosing-call-site-min.js');
 } catch (e) {
   console.log(e);
 }

test/message/source_map_enabled_by_api.js → test/fixtures/message/source_map_enabled_by_api.js

@@ -1,22 +1,22 @@
 'use strict';
-require('../common');
+require('../../common');
 Error.stackTraceLimit = 5;
 
 process.setSourceMapsEnabled(true);
 
 try {
-  require('../fixtures/source-map/enclosing-call-site-min.js');
+  require('../source-map/enclosing-call-site-min.js');
 } catch (e) {
   console.log(e);
 }
 
 delete require.cache[require
-  .resolve('../fixtures/source-map/enclosing-call-site-min.js')];
+  .resolve('../source-map/enclosing-call-site-min.js')];
 
 process.setSourceMapsEnabled(false);
 
 try {
-  require('../fixtures/source-map/enclosing-call-site-min.js');
+  require('../source-map/enclosing-call-site-min.js');
 } catch (e) {
   console.log(e);
 }

test/fixtures/message/source_map_enclosing_function.js

@@ -0,0 +1,7 @@
+// Flags:  --enable-source-maps
+
+'use strict';
+require('../../common');
+Error.stackTraceLimit = 5;
+
+require('../../fixtures/source-map/enclosing-call-site-min.js');

test/message/source_map_enclosing_function.out → test/fixtures/message/source_map_enclosing_function.snapshot

@@ -2,6 +2,7 @@
   throw err
   ^
 
+
 Error: an error!
     at functionD (*enclosing-call-site.js:16:17)
     at functionC (*enclosing-call-site.js:10:3)

test/message/source_map_eval.js → test/fixtures/message/source_map_eval.js

@@ -1,10 +1,10 @@
 // Flags:  --enable-source-maps
 
 'use strict';
-require('../common');
+require('../../common');
 Error.stackTraceLimit = 3;
 
 const fs = require('fs');
 
-const content = fs.readFileSync(require.resolve('../fixtures/source-map/tabs.js'), 'utf8');
+const content = fs.readFileSync(require.resolve('../source-map/tabs.js'), 'utf8');
 eval(content);

test/message/source_map_eval.out → test/fixtures/message/source_map_eval.snapshot

@@ -2,9 +2,10 @@
 	alert "I knew it!"
 	^
 
+
 ReferenceError: alert is not defined
     at Object.eval (*tabs.coffee:26:2)
     at eval (*tabs.coffee:1:14)
-    at Object.<anonymous> (*source_map_eval.js:*:*)
+    at Object.<anonymous> (*fixtures*message*source_map_eval.js:10:1)
 
 Node.js *