#47707 migrated tests/message to JS fixture tests

projectnoa · May 5, 2023 · May 5, 2023 · May 6, 2023 · May 6, 2023 · May 8, 2023
commit 6089c18c76f3556f17e4b25ff521d1ee4e617344
diff --git a/deps/zlib/zconf.h.included b/deps/zlib/zconf.h.included
diff --git a/test/message/assert_throws_stack.js → ...fixtures/assertion/assert_throws_stack.js b/test/message/assert_throws_stack.js → ...fixtures/assertion/assert_throws_stack.js
@@ -1,6 +1,6 @@
 'use strict';
 
-require('../common');
+require('../../common');
 const assert = require('assert').strict;
 
 assert.throws(() => { throw new Error('foo'); }, { bar: true });
diff --git a/test/message/assert_throws_stack.out → ...es/assertion/assert_throws_stack.snapshot b/test/message/assert_throws_stack.out → ...es/assertion/assert_throws_stack.snapshot
@@ -19,9 +19,9 @@ AssertionError [ERR_ASSERTION]: Expected values to be strictly deep-equal:
   generatedMessage: true,
   code: 'ERR_ASSERTION',
   actual: Error: foo
-      at assert.throws.bar (*assert_throws_stack.js:*)
-      at getActual (node:assert:*)
-      at Function.throws (node:assert:*)
+      at assert.throws.bar (*assert_throws_stack.js:*:*)
+      at getActual (node:assert:*:*)
+      at Function.throws (node:assert:*:*)
       at Object.<anonymous> (*assert_throws_stack.js:*:*)
       at *
       at *

diff --git a/test/message/internal_assert.js → test/fixtures/assertion/internal_assert.js b/test/message/internal_assert.js → test/fixtures/assertion/internal_assert.js
@@ -1,7 +1,7 @@
 'use strict';
 
 // Flags: --expose-internals
-require('../common');
+require('../../common');
 
 const assert = require('internal/assert');
 assert(false);
diff --git a/test/message/internal_assert.out → ...xtures/assertion/internal_assert.snapshot b/test/message/internal_assert.out → ...xtures/assertion/internal_assert.snapshot
@@ -7,7 +7,7 @@ Please open an issue with this stack trace at https://github.com/nodejs/node/iss
 
     at new NodeError (node:internal/errors:*:*)
     at assert (node:internal/assert:*:*)
-    at * (*test*message*internal_assert.js:7:1)
+    at * (*test*fixtures*assertion*internal_assert.js:7:1)
     at *
     at *
     at *

diff --git a/test/message/internal_assert_fail.js → ...ixtures/assertion/internal_assert_fail.js b/test/message/internal_assert_fail.js → ...ixtures/assertion/internal_assert_fail.js
@@ -1,7 +1,7 @@
 'use strict';
 
 // Flags: --expose-internals
-require('../common');
+require('../../common');
 
 const assert = require('internal/assert');
 assert.fail('Unreachable!');
diff --git a/test/message/internal_assert_fail.out → ...s/assertion/internal_assert_fail.snapshot b/test/message/internal_assert_fail.out → ...s/assertion/internal_assert_fail.snapshot
@@ -8,7 +8,7 @@ Please open an issue with this stack trace at https://github.com/nodejs/node/iss
 
     at new NodeError (node:internal/errors:*:*)
     at Function.fail (node:internal/assert:*:*)
-    at * (*test*message*internal_assert_fail.js:7:8)
+    at * (*test*fixtures*assertion*internal_assert_fail.js:7:8)
     at *
     at *
     at *

diff --git a/test/message/core_line_numbers.js → test/fixtures/console/core_line_numbers.js b/test/message/core_line_numbers.js → test/fixtures/console/core_line_numbers.js
@@ -1,5 +1,5 @@
 'use strict';
-require('../common');
+require('../../common');
 Error.stackTraceLimit = 3;
 
 const punycode = require('punycode');

diff --git a/test/message/core_line_numbers.out → ...xtures/console/core_line_numbers.snapshot b/test/message/core_line_numbers.out → ...xtures/console/core_line_numbers.snapshot
@@ -5,6 +5,6 @@ node:punycode:49
 RangeError: Invalid input
     at error (node:punycode:49:8)
     at Object.decode (node:punycode:*:*)
-    at Object.<anonymous> (*test*message*core_line_numbers.js:*:*)
+    at Object.<anonymous> (*test*fixtures*console*core_line_numbers.js:*:*)
 
 Node.js *
diff --git a/test/message/eval_messages.js → test/fixtures/console/eval_messages.js b/test/message/eval_messages.js → test/fixtures/console/eval_messages.js
@@ -21,7 +21,7 @@
 
 'use strict';
 
-require('../common');
+require('../../common');
 
 const spawn = require('child_process').spawn;
 

diff --git a/test/message/eval_messages.out → test/fixtures/console/eval_messages.snapshot b/test/message/eval_messages.out → test/fixtures/console/eval_messages.snapshot
diff --git a/test/message/stdin_messages.js → test/fixtures/console/stdin_messages.js b/test/message/stdin_messages.js → test/fixtures/console/stdin_messages.js
@@ -21,7 +21,7 @@
 
 'use strict';
 
-require('../common');
+require('../../common');
 
 const spawn = require('child_process').spawn;
 

diff --git a/test/message/stdin_messages.out → .../fixtures/console/stdin_messages.snapshot b/test/message/stdin_messages.out → .../fixtures/console/stdin_messages.snapshot
diff --git a/test/message/if-error-has-good-stack.js → ...ixtures/errors/if-error-has-good-stack.js b/test/message/if-error-has-good-stack.js → ...ixtures/errors/if-error-has-good-stack.js
@@ -1,6 +1,6 @@
 'use strict';
 
-require('../common');
+require('../../common');
 Error.stackTraceLimit = 4;
 
 const assert = require('assert');

diff --git a/test/message/if-error-has-good-stack.out → ...s/errors/if-error-has-good-stack.snapshot b/test/message/if-error-has-good-stack.out → ...s/errors/if-error-has-good-stack.snapshot
diff --git a/.../test-no-extra-info-on-fatal-exception.js → .../test-no-extra-info-on-fatal-exception.js b/.../test-no-extra-info-on-fatal-exception.js → .../test-no-extra-info-on-fatal-exception.js
@@ -1,7 +1,7 @@
 // Flags: --no-extra-info-on-fatal-exception
 
 'use strict';
-require('../common');
+require('../../common');
 Error.stackTraceLimit = 1;
 
 throw new Error('foo');
diff --git a/...test-no-extra-info-on-fatal-exception.out → ...no-extra-info-on-fatal-exception.snapshot b/...test-no-extra-info-on-fatal-exception.out → ...no-extra-info-on-fatal-exception.snapshot
diff --git a/.../message/throw_error_with_getter_throw.js → ...s/errors/throw_error_with_getter_throw.js b/.../message/throw_error_with_getter_throw.js → ...s/errors/throw_error_with_getter_throw.js
@@ -1,5 +1,7 @@
 'use strict';
-require('../common');
+
+require('../../common');
+
 throw {  // eslint-disable-line no-throw-literal
   get stack() {
     throw new Error('weird throw but ok');

diff --git a/...message/throw_error_with_getter_throw.out → ...rs/throw_error_with_getter_throw.snapshot b/...message/throw_error_with_getter_throw.out → ...rs/throw_error_with_getter_throw.snapshot
diff --git a/test/message/throw_null.js → test/fixtures/errors/throw_null.js b/test/message/throw_null.js → test/fixtures/errors/throw_null.js
@@ -20,7 +20,7 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 'use strict';
-require('../common');
+require('../../common');
 
 // eslint-disable-next-line no-throw-literal
 throw null;
diff --git a/test/message/throw_null.out → test/fixtures/errors/throw_null.snapshot b/test/message/throw_null.out → test/fixtures/errors/throw_null.snapshot
diff --git a/test/message/throw_undefined.js → test/fixtures/errors/throw_undefined.js b/test/message/throw_undefined.js → test/fixtures/errors/throw_undefined.js
@@ -20,7 +20,7 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 'use strict';
-require('../common');
+require('../../common');
 
 // eslint-disable-next-line no-throw-literal
 throw undefined;
diff --git a/test/message/throw_undefined.out → .../fixtures/errors/throw_undefined.snapshot b/test/message/throw_undefined.out → .../fixtures/errors/throw_undefined.snapshot
@@ -1,5 +1,5 @@
 
-*test*message*throw_undefined.js:*
+*test*fixtures*errors*throw_undefined.js:*
 throw undefined;
 ^
 undefined

diff --git a/test/message/timeout_throw.js → test/fixtures/errors/timeout_throw.js b/test/message/timeout_throw.js → test/fixtures/errors/timeout_throw.js
@@ -20,7 +20,7 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 'use strict';
-require('../common');
+require('../../common');
 
 setTimeout(function() {
   // eslint-disable-next-line no-undef,no-unused-expressions

diff --git a/test/message/timeout_throw.out → test/fixtures/errors/timeout_throw.snapshot b/test/message/timeout_throw.out → test/fixtures/errors/timeout_throw.snapshot
@@ -1,8 +1,8 @@
-*test*message*timeout_throw.js:*
+*test*fixtures*errors*timeout_throw.js:*
   undefined_reference_error_maker;
   ^
 ReferenceError: undefined_reference_error_maker is not defined
-    at Timeout._onTimeout (*test*message*timeout_throw.js:*:*)
+    at Timeout._onTimeout (*test*fixtures*errors*timeout_throw.js:*:*)
     at listOnTimeout (node:internal/timers:*:*)
     at process.processTimers (node:internal/timers:*:*)
 

diff --git a/...age/undefined_reference_in_new_context.js → ...ors/undefined_reference_in_new_context.js b/...age/undefined_reference_in_new_context.js → ...ors/undefined_reference_in_new_context.js
@@ -20,7 +20,7 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 'use strict';
-require('../common');
+require('../../common');
 const vm = require('vm');
 
 console.error('before');

diff --git a/...ge/undefined_reference_in_new_context.out → ...defined_reference_in_new_context.snapshot b/...ge/undefined_reference_in_new_context.out → ...defined_reference_in_new_context.snapshot
@@ -8,6 +8,6 @@ ReferenceError: foo is not defined
     at Script.runInContext (node:vm:*)
     at Script.runInNewContext (node:vm:*)
     at Object.runInNewContext (node:vm:*)
-    at Object.<anonymous> (*test*message*undefined_reference_in_new_context.js:*)
+    at Object.<anonymous> (*test*fixtures*errors*undefined_reference_in_new_context.js:*)
 
 Node.js *
diff --git a/test/message/util-inspect-error-cause.js → ...xtures/errors/util-inspect-error-cause.js b/test/message/util-inspect-error-cause.js → ...xtures/errors/util-inspect-error-cause.js
@@ -1,6 +1,6 @@
 'use strict';
 
-require('../common');
+require('../../common');
 
 const { inspect } = require('util');
 

diff --git a/test/message/util-inspect-error-cause.out → .../errors/util-inspect-error-cause.snapshot b/test/message/util-inspect-error-cause.out → .../errors/util-inspect-error-cause.snapshot
diff --git a/test/message/util_inspect_error.js → test/fixtures/errors/util_inspect_error.js b/test/message/util_inspect_error.js → test/fixtures/errors/util_inspect_error.js
@@ -1,6 +1,6 @@
 'use strict';
 
-require('../common');
+require('../../common');
 const util = require('util');
 
 const err = new Error('foo\nbar');

diff --git a/test/message/util_inspect_error.out → ...xtures/errors/util_inspect_error.snapshot b/test/message/util_inspect_error.out → ...xtures/errors/util_inspect_error.snapshot
diff --git a/test/message/v8_warning.js → test/fixtures/errors/v8_warning.js b/test/message/v8_warning.js → test/fixtures/errors/v8_warning.js
@@ -1,6 +1,6 @@
 'use strict';
 
-require('../common');
+require('../../common');
 
 function AsmModule() {
   'use asm';

diff --git a/test/message/v8_warning.out → test/fixtures/errors/v8_warning.snapshot b/test/message/v8_warning.out → test/fixtures/errors/v8_warning.snapshot
diff --git a/test/fixtures/map/source_map_enclosing_function.js b/test/fixtures/map/source_map_enclosing_function.js
@@ -0,0 +1,7 @@
+// Flags:  --enable-source-maps
+
+'use strict';
+require('../../common');
+Error.stackTraceLimit = 5;
+
+require('../source-map/enclosing-call-site-min.js');
diff --git a/...message/source_map_enclosing_function.out → ...ap/source_map_enclosing_function.snapshot b/...message/source_map_enclosing_function.out → ...ap/source_map_enclosing_function.snapshot
diff --git a/...essage/source_map_reference_error_tabs.js → ...es/map/source_map_reference_error_tabs.js b/...essage/source_map_reference_error_tabs.js → ...es/map/source_map_reference_error_tabs.js
@@ -1,7 +1,7 @@
 // Flags:  --enable-source-maps
 
 'use strict';
-require('../common');
+require('../../common');
 Error.stackTraceLimit = 2;
 
-require('../fixtures/source-map/tabs.js');
+require('../source-map/tabs.js');
diff --git a/...ssage/source_map_reference_error_tabs.out → .../source_map_reference_error_tabs.snapshot b/...ssage/source_map_reference_error_tabs.out → .../source_map_reference_error_tabs.snapshot
diff --git a/...ge/source_map_sourcemapping_url_string.js → ...ap/source_map_sourcemapping_url_string.js b/...ge/source_map_sourcemapping_url_string.js → ...ap/source_map_sourcemapping_url_string.js
@@ -1,11 +1,11 @@
 // Flags:  --enable-source-maps
 
 'use strict';
-require('../common');
+require('../../common');
 Error.stackTraceLimit = 2;
 
 try {
-  require('../fixtures/source-map/typescript-sourcemapping_url_string');
+  require('../source-map/typescript-sourcemapping_url_string');
 } catch (err) {
   setTimeout(() => {
     console.info(err);

diff --git a/...e/source_map_sourcemapping_url_string.out → ...rce_map_sourcemapping_url_string.snapshot b/...e/source_map_sourcemapping_url_string.out → ...rce_map_sourcemapping_url_string.snapshot
@@ -1,3 +1,3 @@
 Error: an exception.
-    at *typescript-sourcemapping_url_string.ts:3:7*
+    at Object.<anonymous> (*typescript-sourcemapping_url_string.ts:3:7)
     at Module._compile (node:internal/modules/cjs/loader:*)
diff --git a/test/message/source_map_throw_catch.js → test/fixtures/map/source_map_throw_catch.js b/test/message/source_map_throw_catch.js → test/fixtures/map/source_map_throw_catch.js
@@ -1,11 +1,11 @@
 // Flags:  --enable-source-maps
 
 'use strict';
-require('../common');
+require('../../common');
 Error.stackTraceLimit = 2;
 
 try {
-  require('../fixtures/source-map/typescript-throw');
+  require('../source-map/typescript-throw');
 } catch (err) {
   setTimeout(() => {
     console.info(err);

diff --git a/test/message/source_map_throw_catch.out → ...tures/map/source_map_throw_catch.snapshot b/test/message/source_map_throw_catch.out → ...tures/map/source_map_throw_catch.snapshot
diff --git a/test/message/source_map_throw_icu.js → test/fixtures/map/source_map_throw_icu.js b/test/message/source_map_throw_icu.js → test/fixtures/map/source_map_throw_icu.js
@@ -1,7 +1,7 @@
 // Flags: --enable-source-maps
 
 'use strict';
-require('../common');
+require('../../common');
 Error.stackTraceLimit = 2;
 
-require('../fixtures/source-map/icu');
+require('../source-map/icu');
diff --git a/test/message/source_map_throw_icu.out → ...ixtures/map/source_map_throw_icu.snapshot b/test/message/source_map_throw_icu.out → ...ixtures/map/source_map_throw_icu.snapshot
diff --git a/test/fixtures/map/source_map_throw_set_immediate.js b/test/fixtures/map/source_map_throw_set_immediate.js
@@ -0,0 +1,5 @@
+// Flags:  --enable-source-maps
+
+'use strict';
+require('../../common');
+require('../source-map/uglify-throw');
diff --git a/...essage/source_map_throw_set_immediate.out → ...p/source_map_throw_set_immediate.snapshot b/...essage/source_map_throw_set_immediate.out → ...p/source_map_throw_set_immediate.snapshot
diff --git a/...sage/promise_unhandled_warn_with_error.js → ...mise/promise_unhandled_warn_with_error.js b/...sage/promise_unhandled_warn_with_error.js → ...mise/promise_unhandled_warn_with_error.js
@@ -1,7 +1,7 @@
 // Flags: --unhandled-rejections=warn-with-error-code
 'use strict';
 
-require('../common');
+require('../../common');
 const assert = require('assert');
 
 Promise.reject(new Error('alas'));

diff --git a/...age/promise_unhandled_warn_with_error.out → ...romise_unhandled_warn_with_error.snapshot b/...age/promise_unhandled_warn_with_error.out → ...romise_unhandled_warn_with_error.snapshot
diff --git a/...ssage/unhandled_promise_trace_warnings.js → ...omise/unhandled_promise_trace_warnings.js b/...ssage/unhandled_promise_trace_warnings.js → ...omise/unhandled_promise_trace_warnings.js
@@ -1,5 +1,5 @@
 // Flags: --trace-warnings --unhandled-rejections=warn
 'use strict';
-require('../common');
+require('../../common');
 const p = Promise.reject(new Error('This was rejected'));
 setImmediate(() => p.catch(() => {}));
diff --git a/...sage/unhandled_promise_trace_warnings.out → ...unhandled_promise_trace_warnings.snapshot b/...sage/unhandled_promise_trace_warnings.out → ...unhandled_promise_trace_warnings.snapshot
@@ -1,5 +1,5 @@
 (node:*) UnhandledPromiseRejectionWarning: Error: This was rejected
-    at * (*test*message*unhandled_promise_trace_warnings.js:*)
+    at * (*test*fixtures*promise*unhandled_promise_trace_warnings.js:*)
     at *
     at *
     at *
@@ -10,7 +10,7 @@
     at *
     at *
 (node:*) Error: This was rejected
-    at * (*test*message*unhandled_promise_trace_warnings.js:*)
+    at * (*test*fixtures*promise*unhandled_promise_trace_warnings.js:*)
     at *
     at *
     at *
@@ -22,5 +22,5 @@
     at promiseRejectHandler (node:internal/process/promises:*)
     at Promise.then *
     at Promise.catch *
-    at Immediate.<anonymous> (*test*message*unhandled_promise_trace_warnings.js:*)
+    at Immediate.<anonymous> (*test*fixtures*promise*unhandled_promise_trace_warnings.js:*)
     at *
diff --git a/test/message/max_tick_depth.js → test/fixtures/tick/max_tick_depth.js b/test/message/max_tick_depth.js → test/fixtures/tick/max_tick_depth.js
@@ -20,7 +20,7 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 'use strict';
-require('../common');
+require('../../common');
 
 process.maxTickDepth = 10;
 let i = 20;

diff --git a/test/message/max_tick_depth.out → test/fixtures/tick/max_tick_depth.snapshot b/test/message/max_tick_depth.out → test/fixtures/tick/max_tick_depth.snapshot
diff --git a/test/message/nexttick_throw.js → test/fixtures/tick/nexttick_throw.js b/test/message/nexttick_throw.js → test/fixtures/tick/nexttick_throw.js
@@ -20,7 +20,7 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 'use strict';
-require('../common');
+require('../../common');
 
 process.nextTick(function() {
   process.nextTick(function() {

diff --git a/test/message/nexttick_throw.out → test/fixtures/tick/nexttick_throw.snapshot b/test/message/nexttick_throw.out → test/fixtures/tick/nexttick_throw.snapshot
@@ -1,9 +1,9 @@
 
-*test*message*nexttick_throw.js:*
+*test*fixtures*tick*nexttick_throw.js:*
         undefined_reference_error_maker;
         ^
 ReferenceError: undefined_reference_error_maker is not defined
-    at *test*message*nexttick_throw.js:*:*
+    at *test*fixtures*tick*nexttick_throw.js:*:*
     at process.processTicksAndRejections (node:internal/process/task_queues:*:*)
 
 Node.js *
diff --git a/test/message/message.status b/test/message/message.status
diff --git a/test/message/source_map_enclosing_function.js b/test/message/source_map_enclosing_function.js
diff --git a/test/message/source_map_throw_set_immediate.js b/test/message/source_map_throw_set_immediate.js