Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions lib/internal/test_runner/test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
const {
ArrayFrom,
ArrayPrototypeEvery,
ArrayPrototypeJoin,
ArrayPrototypePush,
ArrayPrototypePushApply,
ArrayPrototypeShift,
Expand DownExpand Up@@ -1668,6 +1669,17 @@ class Test extends AsyncResource {
details.passed_on_attempt = this.passedAttempt;
}

// Generate classname from suite hierarchy for JUnit reporter
if (this.parent && this.parent !== this.root) {
const parts = [];
for (let t = this.parent; t !== t.root; t = t.parent) {
ArrayPrototypeUnshift(parts, t.name);
}
if (parts.length > 0) {
details.classname = ArrayPrototypeJoin(parts, '.');
}
}

return { __proto__: null, details, directive };
}

Expand Down
2 changes: 2 additions & 0 deletions lib/internal/test_runner/tests_stream.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ class TestsStream extends Readable {
parentId,
details,
tags: ArrayPrototypeSlice(tags),
...(details.classname && { __proto__: null, classname: details.classname }),
...loc,
...directive,
});
Expand All@@ -60,6 +61,7 @@ class TestsStream extends Readable {
parentId,
details,
tags: ArrayPrototypeSlice(tags),
...(details.classname && { __proto__: null, classname: details.classname }),
...loc,
...directive,
});
Expand Down
19 changes: 19 additions & 0 deletions test/fixtures/test-runner/output/junit_classname_hierarchy.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
'use strict';
require('../../../common');
const { suite, test } = require('node:test');

suite('Math', () => {
suite('Addition', () => {
test('adds positive numbers', () => {});
});

suite('Multiplication', () => {
test('multiplies positive numbers', () => {});
});
});

suite('String', () => {
test('concatenates strings', () => {});
});

test('standalone test', () => {});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<testsuites>
<testsuite name="Math" time="*" disabled="0" errors="0" tests="2" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testsuite name="Addition" time="*" disabled="0" errors="0" tests="1" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="adds positive numbers" time="*" classname="Math.Addition" file="*"/>
</testsuite>
<testsuite name="Multiplication" time="*" disabled="0" errors="0" tests="1" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="multiplies positive numbers" time="*" classname="Math.Multiplication" file="*"/>
</testsuite>
</testsuite>
<testsuite name="String" time="*" disabled="0" errors="0" tests="1" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="concatenates strings" time="*" classname="String" file="*"/>
</testsuite>
<testcase name="standalone test" time="*" classname="test" file="*"/>
<!-- tests 4 -->
<!-- suites 4 -->
<!-- pass 4 -->
<!-- fail 0 -->
<!-- cancelled 0 -->
<!-- skipped 0 -->
<!-- todo 0 -->
<!-- duration_ms * -->
</testsuites>
24 changes: 12 additions & 12 deletions test/fixtures/test-runner/output/junit_reporter.snapshot
Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,7 @@ true !== false
<testcase name="immediate reject - passes but warns" time="*" classname="test" file="*"/>
<testcase name="immediate resolve pass" time="*" classname="test" file="*"/>
<testsuite name="subtest sync throw fail" time="*" disabled="0" errors="0" tests="1" failures="1" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="+sync throw fail" time="*" classname="test" file="*" failure="thrown from subtest sync throw fail">
<testcase name="+sync throw fail" time="*" classname="subtest sync throw fail" file="*" failure="thrown from subtest sync throw fail">
<failure type="testCodeFailure" message="thrown from subtest sync throw fail">
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fail
at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:125:11)
Expand All@@ -152,15 +152,15 @@ Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fail
</failure>
</testcase>
<testsuite name="level 0a" time="*" disabled="0" errors="0" tests="4" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="level 1a" time="*" classname="test" file="*"/>
<testcase name="level 1b" time="*" classname="test" file="*"/>
<testcase name="level 1c" time="*" classname="test" file="*"/>
<testcase name="level 1d" time="*" classname="test" file="*"/>
<testcase name="level 1a" time="*" classname="level 0a" file="*"/>
<testcase name="level 1b" time="*" classname="level 0a" file="*"/>
<testcase name="level 1c" time="*" classname="level 0a" file="*"/>
<testcase name="level 1d" time="*" classname="level 0a" file="*"/>
</testsuite>
<testsuite name="top level" time="*" disabled="0" errors="0" tests="2" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="+long running" time="*" classname="test" file="*"/>
<testcase name="+long running" time="*" classname="top level" file="*"/>
<testsuite name="+short running" time="*" disabled="0" errors="0" tests="1" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="++short running" time="*" classname="test" file="*"/>
<testcase name="++short running" time="*" classname="top level.+short running" file="*"/>
</testsuite>
</testsuite>
<testcase name="invalid subtest - pass but subtest fails" time="*" classname="test" file="*"/>
Expand DownExpand Up@@ -267,9 +267,9 @@ Error [ERR_TEST_FAILURE]: thrown from callback async throw
</testcase>
<testcase name="callback async throw after done" time="*" classname="test" file="*"/>
<testsuite name="only is set on subtests but not in only mode" time="*" disabled="0" errors="0" tests="3" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="running subtest 1" time="*" classname="test" file="*"/>
<testcase name="running subtest 3" time="*" classname="test" file="*"/>
<testcase name="running subtest 4" time="*" classname="test" file="*"/>
<testcase name="running subtest 1" time="*" classname="only is set on subtests but not in only mode" file="*"/>
<testcase name="running subtest 3" time="*" classname="only is set on subtests but not in only mode" file="*"/>
<testcase name="running subtest 4" time="*" classname="only is set on subtests but not in only mode" file="*"/>
</testsuite>
<testcase name="custom inspect symbol fail" time="*" classname="test" file="*" failure="customized">
<failure type="testCodeFailure" message="customized">
Expand All@@ -289,7 +289,7 @@ Error [ERR_TEST_FAILURE]: thrown from callback async throw
</failure>
</testcase>
<testsuite name="subtest sync throw fails" time="*" disabled="0" errors="0" tests="2" failures="2" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="sync throw fails at first" time="*" classname="test" file="*" failure="thrown from subtest sync throw fails at first">
<testcase name="sync throw fails at first" time="*" classname="subtest sync throw fails" file="*" failure="thrown from subtest sync throw fails at first">
<failure type="testCodeFailure" message="thrown from subtest sync throw fails at first">
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at first
at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:334:11)
Expand All@@ -304,7 +304,7 @@ Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at first
}
</failure>
</testcase>
<testcase name="sync throw fails at second" time="*" classname="test" file="*" failure="thrown from subtest sync throw fails at second">
<testcase name="sync throw fails at second" time="*" classname="subtest sync throw fails" file="*" failure="thrown from subtest sync throw fails at second">
<failure type="testCodeFailure" message="thrown from subtest sync throw fails at second">
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at second
at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:337:11) {
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-runner-reporters.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -207,7 +207,7 @@ describe('node:test reporters', { concurrency: true }, () => {
assert.match(timestamp, /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/);
assert.ok(!Number.isNaN(Date.parse(timestamp)), `expected a valid date, got ${timestamp}`);
assert.match(fileContents, /<testcase .*name="failing".*>\s*<failure .*type="testCodeFailure".*message="error".*>/);
assert.match(fileContents, /<testcase .*name="ok".*classname="test".*\/>/);
assert.match(fileContents, /<testcase .*name="ok".*classname="nested".*\/>/);
assert.match(fileContents, /<testcase .*name="top level".*classname="test".*\/>/);
});
});
12 changes: 12 additions & 0 deletions test/test-runner/test-output-junit-classname-hierarchy.mjs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
// Test that the output of test-runner/output/junit_classname_hierarchy.js matches
// test-runner/output/junit_classname_hierarchy.snapshot
import '../common/index.mjs';
import * as fixtures from '../common/fixtures.mjs';
import { spawnAndAssert, junitTransform, ensureCwdIsProjectRoot } from '../common/assertSnapshot.js';

ensureCwdIsProjectRoot();
await spawnAndAssert(
fixtures.path('test-runner/output/junit_classname_hierarchy.js'),
junitTransform,
{ flags: ['--test-reporter=junit'] },
);
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions lib/internal/test_runner/test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
const {
ArrayFrom,
ArrayPrototypeEvery,
ArrayPrototypeJoin,
ArrayPrototypePush,
ArrayPrototypePushApply,
ArrayPrototypeShift,
Expand DownExpand Up@@ -1668,6 +1669,17 @@ class Test extends AsyncResource {
details.passed_on_attempt = this.passedAttempt;
}

// Generate classname from suite hierarchy for JUnit reporter
if (this.parent && this.parent !== this.root) {
const parts = [];
for (let t = this.parent; t !== t.root; t = t.parent) {
ArrayPrototypeUnshift(parts, t.name);
}
if (parts.length > 0) {
details.classname = ArrayPrototypeJoin(parts, '.');
}
}

return { __proto__: null, details, directive };
}

Expand Down
2 changes: 2 additions & 0 deletions lib/internal/test_runner/tests_stream.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ class TestsStream extends Readable {
parentId,
details,
tags: ArrayPrototypeSlice(tags),
...(details.classname && { __proto__: null, classname: details.classname }),
...loc,
...directive,
});
Expand All@@ -60,6 +61,7 @@ class TestsStream extends Readable {
parentId,
details,
tags: ArrayPrototypeSlice(tags),
...(details.classname && { __proto__: null, classname: details.classname }),
...loc,
...directive,
});
Expand Down
19 changes: 19 additions & 0 deletions test/fixtures/test-runner/output/junit_classname_hierarchy.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
'use strict';
require('../../../common');
const { suite, test } = require('node:test');

suite('Math', () => {
suite('Addition', () => {
test('adds positive numbers', () => {});
});

suite('Multiplication', () => {
test('multiplies positive numbers', () => {});
});
});

suite('String', () => {
test('concatenates strings', () => {});
});

test('standalone test', () => {});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<testsuites>
<testsuite name="Math" time="*" disabled="0" errors="0" tests="2" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testsuite name="Addition" time="*" disabled="0" errors="0" tests="1" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="adds positive numbers" time="*" classname="Math.Addition" file="*"/>
</testsuite>
<testsuite name="Multiplication" time="*" disabled="0" errors="0" tests="1" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="multiplies positive numbers" time="*" classname="Math.Multiplication" file="*"/>
</testsuite>
</testsuite>
<testsuite name="String" time="*" disabled="0" errors="0" tests="1" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="concatenates strings" time="*" classname="String" file="*"/>
</testsuite>
<testcase name="standalone test" time="*" classname="test" file="*"/>
<!-- tests 4 -->
<!-- suites 4 -->
<!-- pass 4 -->
<!-- fail 0 -->
<!-- cancelled 0 -->
<!-- skipped 0 -->
<!-- todo 0 -->
<!-- duration_ms * -->
</testsuites>
24 changes: 12 additions & 12 deletions test/fixtures/test-runner/output/junit_reporter.snapshot
Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,7 @@ true !== false
<testcase name="immediate reject - passes but warns" time="*" classname="test" file="*"/>
<testcase name="immediate resolve pass" time="*" classname="test" file="*"/>
<testsuite name="subtest sync throw fail" time="*" disabled="0" errors="0" tests="1" failures="1" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="+sync throw fail" time="*" classname="test" file="*" failure="thrown from subtest sync throw fail">
<testcase name="+sync throw fail" time="*" classname="subtest sync throw fail" file="*" failure="thrown from subtest sync throw fail">
<failure type="testCodeFailure" message="thrown from subtest sync throw fail">
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fail
at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:125:11)
Expand All@@ -152,15 +152,15 @@ Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fail
</failure>
</testcase>
<testsuite name="level 0a" time="*" disabled="0" errors="0" tests="4" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="level 1a" time="*" classname="test" file="*"/>
<testcase name="level 1b" time="*" classname="test" file="*"/>
<testcase name="level 1c" time="*" classname="test" file="*"/>
<testcase name="level 1d" time="*" classname="test" file="*"/>
<testcase name="level 1a" time="*" classname="level 0a" file="*"/>
<testcase name="level 1b" time="*" classname="level 0a" file="*"/>
<testcase name="level 1c" time="*" classname="level 0a" file="*"/>
<testcase name="level 1d" time="*" classname="level 0a" file="*"/>
</testsuite>
<testsuite name="top level" time="*" disabled="0" errors="0" tests="2" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="+long running" time="*" classname="test" file="*"/>
<testcase name="+long running" time="*" classname="top level" file="*"/>
<testsuite name="+short running" time="*" disabled="0" errors="0" tests="1" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="++short running" time="*" classname="test" file="*"/>
<testcase name="++short running" time="*" classname="top level.+short running" file="*"/>
</testsuite>
</testsuite>
<testcase name="invalid subtest - pass but subtest fails" time="*" classname="test" file="*"/>
Expand DownExpand Up@@ -267,9 +267,9 @@ Error [ERR_TEST_FAILURE]: thrown from callback async throw
</testcase>
<testcase name="callback async throw after done" time="*" classname="test" file="*"/>
<testsuite name="only is set on subtests but not in only mode" time="*" disabled="0" errors="0" tests="3" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="running subtest 1" time="*" classname="test" file="*"/>
<testcase name="running subtest 3" time="*" classname="test" file="*"/>
<testcase name="running subtest 4" time="*" classname="test" file="*"/>
<testcase name="running subtest 1" time="*" classname="only is set on subtests but not in only mode" file="*"/>
<testcase name="running subtest 3" time="*" classname="only is set on subtests but not in only mode" file="*"/>
<testcase name="running subtest 4" time="*" classname="only is set on subtests but not in only mode" file="*"/>
</testsuite>
<testcase name="custom inspect symbol fail" time="*" classname="test" file="*" failure="customized">
<failure type="testCodeFailure" message="customized">
Expand All@@ -289,7 +289,7 @@ Error [ERR_TEST_FAILURE]: thrown from callback async throw
</failure>
</testcase>
<testsuite name="subtest sync throw fails" time="*" disabled="0" errors="0" tests="2" failures="2" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="sync throw fails at first" time="*" classname="test" file="*" failure="thrown from subtest sync throw fails at first">
<testcase name="sync throw fails at first" time="*" classname="subtest sync throw fails" file="*" failure="thrown from subtest sync throw fails at first">
<failure type="testCodeFailure" message="thrown from subtest sync throw fails at first">
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at first
at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:334:11)
Expand All@@ -304,7 +304,7 @@ Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at first
}
</failure>
</testcase>
<testcase name="sync throw fails at second" time="*" classname="test" file="*" failure="thrown from subtest sync throw fails at second">
<testcase name="sync throw fails at second" time="*" classname="subtest sync throw fails" file="*" failure="thrown from subtest sync throw fails at second">
<failure type="testCodeFailure" message="thrown from subtest sync throw fails at second">
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at second
at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:337:11) {
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-runner-reporters.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -207,7 +207,7 @@ describe('node:test reporters', { concurrency: true }, () => {
assert.match(timestamp, /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/);
assert.ok(!Number.isNaN(Date.parse(timestamp)), `expected a valid date, got ${timestamp}`);
assert.match(fileContents, /<testcase .*name="failing".*>\s*<failure .*type="testCodeFailure".*message="error".*>/);
assert.match(fileContents, /<testcase .*name="ok".*classname="test".*\/>/);
assert.match(fileContents, /<testcase .*name="ok".*classname="nested".*\/>/);
assert.match(fileContents, /<testcase .*name="top level".*classname="test".*\/>/);
});
});
12 changes: 12 additions & 0 deletions test/test-runner/test-output-junit-classname-hierarchy.mjs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
// Test that the output of test-runner/output/junit_classname_hierarchy.js matches
// test-runner/output/junit_classname_hierarchy.snapshot
import '../common/index.mjs';
import * as fixtures from '../common/fixtures.mjs';
import { spawnAndAssert, junitTransform, ensureCwdIsProjectRoot } from '../common/assertSnapshot.js';

ensureCwdIsProjectRoot();
await spawnAndAssert(
fixtures.path('test-runner/output/junit_classname_hierarchy.js'),
junitTransform,
{ flags: ['--test-reporter=junit'] },
);
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions lib/internal/test_runner/test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
const {
ArrayFrom,
ArrayPrototypeEvery,
ArrayPrototypeJoin,
ArrayPrototypePush,
ArrayPrototypePushApply,
ArrayPrototypeShift,
Expand DownExpand Up@@ -1668,6 +1669,17 @@ class Test extends AsyncResource {
details.passed_on_attempt = this.passedAttempt;
}

// Generate classname from suite hierarchy for JUnit reporter
if (this.parent && this.parent !== this.root) {
const parts = [];
for (let t = this.parent; t !== t.root; t = t.parent) {
ArrayPrototypeUnshift(parts, t.name);
}
if (parts.length > 0) {
details.classname = ArrayPrototypeJoin(parts, '.');
}
}

return { __proto__: null, details, directive };
}

Expand Down
2 changes: 2 additions & 0 deletions lib/internal/test_runner/tests_stream.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ class TestsStream extends Readable {
parentId,
details,
tags: ArrayPrototypeSlice(tags),
...(details.classname && { __proto__: null, classname: details.classname }),
...loc,
...directive,
});
Expand All@@ -60,6 +61,7 @@ class TestsStream extends Readable {
parentId,
details,
tags: ArrayPrototypeSlice(tags),
...(details.classname && { __proto__: null, classname: details.classname }),
...loc,
...directive,
});
Expand Down
19 changes: 19 additions & 0 deletions test/fixtures/test-runner/output/junit_classname_hierarchy.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
'use strict';
require('../../../common');
const { suite, test } = require('node:test');

suite('Math', () => {
suite('Addition', () => {
test('adds positive numbers', () => {});
});

suite('Multiplication', () => {
test('multiplies positive numbers', () => {});
});
});

suite('String', () => {
test('concatenates strings', () => {});
});

test('standalone test', () => {});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<testsuites>
<testsuite name="Math" time="*" disabled="0" errors="0" tests="2" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testsuite name="Addition" time="*" disabled="0" errors="0" tests="1" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="adds positive numbers" time="*" classname="Math.Addition" file="*"/>
</testsuite>
<testsuite name="Multiplication" time="*" disabled="0" errors="0" tests="1" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="multiplies positive numbers" time="*" classname="Math.Multiplication" file="*"/>
</testsuite>
</testsuite>
<testsuite name="String" time="*" disabled="0" errors="0" tests="1" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="concatenates strings" time="*" classname="String" file="*"/>
</testsuite>
<testcase name="standalone test" time="*" classname="test" file="*"/>
<!-- tests 4 -->
<!-- suites 4 -->
<!-- pass 4 -->
<!-- fail 0 -->
<!-- cancelled 0 -->
<!-- skipped 0 -->
<!-- todo 0 -->
<!-- duration_ms * -->
</testsuites>
24 changes: 12 additions & 12 deletions test/fixtures/test-runner/output/junit_reporter.snapshot
Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,7 @@ true !== false
<testcase name="immediate reject - passes but warns" time="*" classname="test" file="*"/>
<testcase name="immediate resolve pass" time="*" classname="test" file="*"/>
<testsuite name="subtest sync throw fail" time="*" disabled="0" errors="0" tests="1" failures="1" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="+sync throw fail" time="*" classname="test" file="*" failure="thrown from subtest sync throw fail">
<testcase name="+sync throw fail" time="*" classname="subtest sync throw fail" file="*" failure="thrown from subtest sync throw fail">
<failure type="testCodeFailure" message="thrown from subtest sync throw fail">
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fail
at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:125:11)
Expand All@@ -152,15 +152,15 @@ Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fail
</failure>
</testcase>
<testsuite name="level 0a" time="*" disabled="0" errors="0" tests="4" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="level 1a" time="*" classname="test" file="*"/>
<testcase name="level 1b" time="*" classname="test" file="*"/>
<testcase name="level 1c" time="*" classname="test" file="*"/>
<testcase name="level 1d" time="*" classname="test" file="*"/>
<testcase name="level 1a" time="*" classname="level 0a" file="*"/>
<testcase name="level 1b" time="*" classname="level 0a" file="*"/>
<testcase name="level 1c" time="*" classname="level 0a" file="*"/>
<testcase name="level 1d" time="*" classname="level 0a" file="*"/>
</testsuite>
<testsuite name="top level" time="*" disabled="0" errors="0" tests="2" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="+long running" time="*" classname="test" file="*"/>
<testcase name="+long running" time="*" classname="top level" file="*"/>
<testsuite name="+short running" time="*" disabled="0" errors="0" tests="1" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="++short running" time="*" classname="test" file="*"/>
<testcase name="++short running" time="*" classname="top level.+short running" file="*"/>
</testsuite>
</testsuite>
<testcase name="invalid subtest - pass but subtest fails" time="*" classname="test" file="*"/>
Expand DownExpand Up@@ -267,9 +267,9 @@ Error [ERR_TEST_FAILURE]: thrown from callback async throw
</testcase>
<testcase name="callback async throw after done" time="*" classname="test" file="*"/>
<testsuite name="only is set on subtests but not in only mode" time="*" disabled="0" errors="0" tests="3" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="running subtest 1" time="*" classname="test" file="*"/>
<testcase name="running subtest 3" time="*" classname="test" file="*"/>
<testcase name="running subtest 4" time="*" classname="test" file="*"/>
<testcase name="running subtest 1" time="*" classname="only is set on subtests but not in only mode" file="*"/>
<testcase name="running subtest 3" time="*" classname="only is set on subtests but not in only mode" file="*"/>
<testcase name="running subtest 4" time="*" classname="only is set on subtests but not in only mode" file="*"/>
</testsuite>
<testcase name="custom inspect symbol fail" time="*" classname="test" file="*" failure="customized">
<failure type="testCodeFailure" message="customized">
Expand All@@ -289,7 +289,7 @@ Error [ERR_TEST_FAILURE]: thrown from callback async throw
</failure>
</testcase>
<testsuite name="subtest sync throw fails" time="*" disabled="0" errors="0" tests="2" failures="2" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="sync throw fails at first" time="*" classname="test" file="*" failure="thrown from subtest sync throw fails at first">
<testcase name="sync throw fails at first" time="*" classname="subtest sync throw fails" file="*" failure="thrown from subtest sync throw fails at first">
<failure type="testCodeFailure" message="thrown from subtest sync throw fails at first">
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at first
at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:334:11)
Expand All@@ -304,7 +304,7 @@ Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at first
}
</failure>
</testcase>
<testcase name="sync throw fails at second" time="*" classname="test" file="*" failure="thrown from subtest sync throw fails at second">
<testcase name="sync throw fails at second" time="*" classname="subtest sync throw fails" file="*" failure="thrown from subtest sync throw fails at second">
<failure type="testCodeFailure" message="thrown from subtest sync throw fails at second">
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at second
at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:337:11) {
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-runner-reporters.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -207,7 +207,7 @@ describe('node:test reporters', { concurrency: true }, () => {
assert.match(timestamp, /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/);
assert.ok(!Number.isNaN(Date.parse(timestamp)), `expected a valid date, got ${timestamp}`);
assert.match(fileContents, /<testcase .*name="failing".*>\s*<failure .*type="testCodeFailure".*message="error".*>/);
assert.match(fileContents, /<testcase .*name="ok".*classname="test".*\/>/);
assert.match(fileContents, /<testcase .*name="ok".*classname="nested".*\/>/);
assert.match(fileContents, /<testcase .*name="top level".*classname="test".*\/>/);
});
});
12 changes: 12 additions & 0 deletions test/test-runner/test-output-junit-classname-hierarchy.mjs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
// Test that the output of test-runner/output/junit_classname_hierarchy.js matches
// test-runner/output/junit_classname_hierarchy.snapshot
import '../common/index.mjs';
import * as fixtures from '../common/fixtures.mjs';
import { spawnAndAssert, junitTransform, ensureCwdIsProjectRoot } from '../common/assertSnapshot.js';

ensureCwdIsProjectRoot();
await spawnAndAssert(
fixtures.path('test-runner/output/junit_classname_hierarchy.js'),
junitTransform,
{ flags: ['--test-reporter=junit'] },
);
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions lib/internal/test_runner/test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
const {
ArrayFrom,
ArrayPrototypeEvery,
ArrayPrototypeJoin,
ArrayPrototypePush,
ArrayPrototypePushApply,
ArrayPrototypeShift,
Expand DownExpand Up@@ -1668,6 +1669,17 @@ class Test extends AsyncResource {
details.passed_on_attempt = this.passedAttempt;
}

// Generate classname from suite hierarchy for JUnit reporter
if (this.parent && this.parent !== this.root) {
const parts = [];
for (let t = this.parent; t !== t.root; t = t.parent) {
ArrayPrototypeUnshift(parts, t.name);
}
if (parts.length > 0) {
details.classname = ArrayPrototypeJoin(parts, '.');
}
}

return { __proto__: null, details, directive };
}

Expand Down
2 changes: 2 additions & 0 deletions lib/internal/test_runner/tests_stream.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ class TestsStream extends Readable {
parentId,
details,
tags: ArrayPrototypeSlice(tags),
...(details.classname && { __proto__: null, classname: details.classname }),
...loc,
...directive,
});
Expand All@@ -60,6 +61,7 @@ class TestsStream extends Readable {
parentId,
details,
tags: ArrayPrototypeSlice(tags),
...(details.classname && { __proto__: null, classname: details.classname }),
...loc,
...directive,
});
Expand Down
19 changes: 19 additions & 0 deletions test/fixtures/test-runner/output/junit_classname_hierarchy.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
'use strict';
require('../../../common');
const { suite, test } = require('node:test');

suite('Math', () => {
suite('Addition', () => {
test('adds positive numbers', () => {});
});

suite('Multiplication', () => {
test('multiplies positive numbers', () => {});
});
});

suite('String', () => {
test('concatenates strings', () => {});
});

test('standalone test', () => {});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<testsuites>
<testsuite name="Math" time="*" disabled="0" errors="0" tests="2" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testsuite name="Addition" time="*" disabled="0" errors="0" tests="1" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="adds positive numbers" time="*" classname="Math.Addition" file="*"/>
</testsuite>
<testsuite name="Multiplication" time="*" disabled="0" errors="0" tests="1" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="multiplies positive numbers" time="*" classname="Math.Multiplication" file="*"/>
</testsuite>
</testsuite>
<testsuite name="String" time="*" disabled="0" errors="0" tests="1" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="concatenates strings" time="*" classname="String" file="*"/>
</testsuite>
<testcase name="standalone test" time="*" classname="test" file="*"/>
<!-- tests 4 -->
<!-- suites 4 -->
<!-- pass 4 -->
<!-- fail 0 -->
<!-- cancelled 0 -->
<!-- skipped 0 -->
<!-- todo 0 -->
<!-- duration_ms * -->
</testsuites>
24 changes: 12 additions & 12 deletions test/fixtures/test-runner/output/junit_reporter.snapshot
Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,7 @@ true !== false
<testcase name="immediate reject - passes but warns" time="*" classname="test" file="*"/>
<testcase name="immediate resolve pass" time="*" classname="test" file="*"/>
<testsuite name="subtest sync throw fail" time="*" disabled="0" errors="0" tests="1" failures="1" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="+sync throw fail" time="*" classname="test" file="*" failure="thrown from subtest sync throw fail">
<testcase name="+sync throw fail" time="*" classname="subtest sync throw fail" file="*" failure="thrown from subtest sync throw fail">
<failure type="testCodeFailure" message="thrown from subtest sync throw fail">
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fail
at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:125:11)
Expand All@@ -152,15 +152,15 @@ Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fail
</failure>
</testcase>
<testsuite name="level 0a" time="*" disabled="0" errors="0" tests="4" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="level 1a" time="*" classname="test" file="*"/>
<testcase name="level 1b" time="*" classname="test" file="*"/>
<testcase name="level 1c" time="*" classname="test" file="*"/>
<testcase name="level 1d" time="*" classname="test" file="*"/>
<testcase name="level 1a" time="*" classname="level 0a" file="*"/>
<testcase name="level 1b" time="*" classname="level 0a" file="*"/>
<testcase name="level 1c" time="*" classname="level 0a" file="*"/>
<testcase name="level 1d" time="*" classname="level 0a" file="*"/>
</testsuite>
<testsuite name="top level" time="*" disabled="0" errors="0" tests="2" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="+long running" time="*" classname="test" file="*"/>
<testcase name="+long running" time="*" classname="top level" file="*"/>
<testsuite name="+short running" time="*" disabled="0" errors="0" tests="1" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="++short running" time="*" classname="test" file="*"/>
<testcase name="++short running" time="*" classname="top level.+short running" file="*"/>
</testsuite>
</testsuite>
<testcase name="invalid subtest - pass but subtest fails" time="*" classname="test" file="*"/>
Expand DownExpand Up@@ -267,9 +267,9 @@ Error [ERR_TEST_FAILURE]: thrown from callback async throw
</testcase>
<testcase name="callback async throw after done" time="*" classname="test" file="*"/>
<testsuite name="only is set on subtests but not in only mode" time="*" disabled="0" errors="0" tests="3" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="running subtest 1" time="*" classname="test" file="*"/>
<testcase name="running subtest 3" time="*" classname="test" file="*"/>
<testcase name="running subtest 4" time="*" classname="test" file="*"/>
<testcase name="running subtest 1" time="*" classname="only is set on subtests but not in only mode" file="*"/>
<testcase name="running subtest 3" time="*" classname="only is set on subtests but not in only mode" file="*"/>
<testcase name="running subtest 4" time="*" classname="only is set on subtests but not in only mode" file="*"/>
</testsuite>
<testcase name="custom inspect symbol fail" time="*" classname="test" file="*" failure="customized">
<failure type="testCodeFailure" message="customized">
Expand All@@ -289,7 +289,7 @@ Error [ERR_TEST_FAILURE]: thrown from callback async throw
</failure>
</testcase>
<testsuite name="subtest sync throw fails" time="*" disabled="0" errors="0" tests="2" failures="2" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="sync throw fails at first" time="*" classname="test" file="*" failure="thrown from subtest sync throw fails at first">
<testcase name="sync throw fails at first" time="*" classname="subtest sync throw fails" file="*" failure="thrown from subtest sync throw fails at first">
<failure type="testCodeFailure" message="thrown from subtest sync throw fails at first">
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at first
at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:334:11)
Expand All@@ -304,7 +304,7 @@ Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at first
}
</failure>
</testcase>
<testcase name="sync throw fails at second" time="*" classname="test" file="*" failure="thrown from subtest sync throw fails at second">
<testcase name="sync throw fails at second" time="*" classname="subtest sync throw fails" file="*" failure="thrown from subtest sync throw fails at second">
<failure type="testCodeFailure" message="thrown from subtest sync throw fails at second">
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at second
at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:337:11) {
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-runner-reporters.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -207,7 +207,7 @@ describe('node:test reporters', { concurrency: true }, () => {
assert.match(timestamp, /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/);
assert.ok(!Number.isNaN(Date.parse(timestamp)), `expected a valid date, got ${timestamp}`);
assert.match(fileContents, /<testcase .*name="failing".*>\s*<failure .*type="testCodeFailure".*message="error".*>/);
assert.match(fileContents, /<testcase .*name="ok".*classname="test".*\/>/);
assert.match(fileContents, /<testcase .*name="ok".*classname="nested".*\/>/);
assert.match(fileContents, /<testcase .*name="top level".*classname="test".*\/>/);
});
});
12 changes: 12 additions & 0 deletions test/test-runner/test-output-junit-classname-hierarchy.mjs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
// Test that the output of test-runner/output/junit_classname_hierarchy.js matches
// test-runner/output/junit_classname_hierarchy.snapshot
import '../common/index.mjs';
import * as fixtures from '../common/fixtures.mjs';
import { spawnAndAssert, junitTransform, ensureCwdIsProjectRoot } from '../common/assertSnapshot.js';

ensureCwdIsProjectRoot();
await spawnAndAssert(
fixtures.path('test-runner/output/junit_classname_hierarchy.js'),
junitTransform,
{ flags: ['--test-reporter=junit'] },
);
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions lib/internal/test_runner/test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
const {
ArrayFrom,
ArrayPrototypeEvery,
ArrayPrototypeJoin,
ArrayPrototypePush,
ArrayPrototypePushApply,
ArrayPrototypeShift,
Expand DownExpand Up@@ -1668,6 +1669,17 @@ class Test extends AsyncResource {
details.passed_on_attempt = this.passedAttempt;
}

// Generate classname from suite hierarchy for JUnit reporter
if (this.parent && this.parent !== this.root) {
const parts = [];
for (let t = this.parent; t !== t.root; t = t.parent) {
ArrayPrototypeUnshift(parts, t.name);
}
if (parts.length > 0) {
details.classname = ArrayPrototypeJoin(parts, '.');
}
}

return { __proto__: null, details, directive };
}

Expand Down
2 changes: 2 additions & 0 deletions lib/internal/test_runner/tests_stream.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ class TestsStream extends Readable {
parentId,
details,
tags: ArrayPrototypeSlice(tags),
...(details.classname && { __proto__: null, classname: details.classname }),
...loc,
...directive,
});
Expand All@@ -60,6 +61,7 @@ class TestsStream extends Readable {
parentId,
details,
tags: ArrayPrototypeSlice(tags),
...(details.classname && { __proto__: null, classname: details.classname }),
...loc,
...directive,
});
Expand Down
19 changes: 19 additions & 0 deletions test/fixtures/test-runner/output/junit_classname_hierarchy.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
'use strict';
require('../../../common');
const { suite, test } = require('node:test');

suite('Math', () => {
suite('Addition', () => {
test('adds positive numbers', () => {});
});

suite('Multiplication', () => {
test('multiplies positive numbers', () => {});
});
});

suite('String', () => {
test('concatenates strings', () => {});
});

test('standalone test', () => {});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<testsuites>
<testsuite name="Math" time="*" disabled="0" errors="0" tests="2" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testsuite name="Addition" time="*" disabled="0" errors="0" tests="1" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="adds positive numbers" time="*" classname="Math.Addition" file="*"/>
</testsuite>
<testsuite name="Multiplication" time="*" disabled="0" errors="0" tests="1" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="multiplies positive numbers" time="*" classname="Math.Multiplication" file="*"/>
</testsuite>
</testsuite>
<testsuite name="String" time="*" disabled="0" errors="0" tests="1" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="concatenates strings" time="*" classname="String" file="*"/>
</testsuite>
<testcase name="standalone test" time="*" classname="test" file="*"/>
<!-- tests 4 -->
<!-- suites 4 -->
<!-- pass 4 -->
<!-- fail 0 -->
<!-- cancelled 0 -->
<!-- skipped 0 -->
<!-- todo 0 -->
<!-- duration_ms * -->
</testsuites>
24 changes: 12 additions & 12 deletions test/fixtures/test-runner/output/junit_reporter.snapshot
Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,7 @@ true !== false
<testcase name="immediate reject - passes but warns" time="*" classname="test" file="*"/>
<testcase name="immediate resolve pass" time="*" classname="test" file="*"/>
<testsuite name="subtest sync throw fail" time="*" disabled="0" errors="0" tests="1" failures="1" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="+sync throw fail" time="*" classname="test" file="*" failure="thrown from subtest sync throw fail">
<testcase name="+sync throw fail" time="*" classname="subtest sync throw fail" file="*" failure="thrown from subtest sync throw fail">
<failure type="testCodeFailure" message="thrown from subtest sync throw fail">
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fail
at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:125:11)
Expand All@@ -152,15 +152,15 @@ Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fail
</failure>
</testcase>
<testsuite name="level 0a" time="*" disabled="0" errors="0" tests="4" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="level 1a" time="*" classname="test" file="*"/>
<testcase name="level 1b" time="*" classname="test" file="*"/>
<testcase name="level 1c" time="*" classname="test" file="*"/>
<testcase name="level 1d" time="*" classname="test" file="*"/>
<testcase name="level 1a" time="*" classname="level 0a" file="*"/>
<testcase name="level 1b" time="*" classname="level 0a" file="*"/>
<testcase name="level 1c" time="*" classname="level 0a" file="*"/>
<testcase name="level 1d" time="*" classname="level 0a" file="*"/>
</testsuite>
<testsuite name="top level" time="*" disabled="0" errors="0" tests="2" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="+long running" time="*" classname="test" file="*"/>
<testcase name="+long running" time="*" classname="top level" file="*"/>
<testsuite name="+short running" time="*" disabled="0" errors="0" tests="1" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="++short running" time="*" classname="test" file="*"/>
<testcase name="++short running" time="*" classname="top level.+short running" file="*"/>
</testsuite>
</testsuite>
<testcase name="invalid subtest - pass but subtest fails" time="*" classname="test" file="*"/>
Expand DownExpand Up@@ -267,9 +267,9 @@ Error [ERR_TEST_FAILURE]: thrown from callback async throw
</testcase>
<testcase name="callback async throw after done" time="*" classname="test" file="*"/>
<testsuite name="only is set on subtests but not in only mode" time="*" disabled="0" errors="0" tests="3" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="running subtest 1" time="*" classname="test" file="*"/>
<testcase name="running subtest 3" time="*" classname="test" file="*"/>
<testcase name="running subtest 4" time="*" classname="test" file="*"/>
<testcase name="running subtest 1" time="*" classname="only is set on subtests but not in only mode" file="*"/>
<testcase name="running subtest 3" time="*" classname="only is set on subtests but not in only mode" file="*"/>
<testcase name="running subtest 4" time="*" classname="only is set on subtests but not in only mode" file="*"/>
</testsuite>
<testcase name="custom inspect symbol fail" time="*" classname="test" file="*" failure="customized">
<failure type="testCodeFailure" message="customized">
Expand All@@ -289,7 +289,7 @@ Error [ERR_TEST_FAILURE]: thrown from callback async throw
</failure>
</testcase>
<testsuite name="subtest sync throw fails" time="*" disabled="0" errors="0" tests="2" failures="2" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="sync throw fails at first" time="*" classname="test" file="*" failure="thrown from subtest sync throw fails at first">
<testcase name="sync throw fails at first" time="*" classname="subtest sync throw fails" file="*" failure="thrown from subtest sync throw fails at first">
<failure type="testCodeFailure" message="thrown from subtest sync throw fails at first">
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at first
at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:334:11)
Expand All@@ -304,7 +304,7 @@ Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at first
}
</failure>
</testcase>
<testcase name="sync throw fails at second" time="*" classname="test" file="*" failure="thrown from subtest sync throw fails at second">
<testcase name="sync throw fails at second" time="*" classname="subtest sync throw fails" file="*" failure="thrown from subtest sync throw fails at second">
<failure type="testCodeFailure" message="thrown from subtest sync throw fails at second">
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at second
at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:337:11) {
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-runner-reporters.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -207,7 +207,7 @@ describe('node:test reporters', { concurrency: true }, () => {
assert.match(timestamp, /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/);
assert.ok(!Number.isNaN(Date.parse(timestamp)), `expected a valid date, got ${timestamp}`);
assert.match(fileContents, /<testcase .*name="failing".*>\s*<failure .*type="testCodeFailure".*message="error".*>/);
assert.match(fileContents, /<testcase .*name="ok".*classname="test".*\/>/);
assert.match(fileContents, /<testcase .*name="ok".*classname="nested".*\/>/);
assert.match(fileContents, /<testcase .*name="top level".*classname="test".*\/>/);
});
});
12 changes: 12 additions & 0 deletions test/test-runner/test-output-junit-classname-hierarchy.mjs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
// Test that the output of test-runner/output/junit_classname_hierarchy.js matches
// test-runner/output/junit_classname_hierarchy.snapshot
import '../common/index.mjs';
import * as fixtures from '../common/fixtures.mjs';
import { spawnAndAssert, junitTransform, ensureCwdIsProjectRoot } from '../common/assertSnapshot.js';

ensureCwdIsProjectRoot();
await spawnAndAssert(
fixtures.path('test-runner/output/junit_classname_hierarchy.js'),
junitTransform,
{ flags: ['--test-reporter=junit'] },
);
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions lib/internal/test_runner/test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
const {
ArrayFrom,
ArrayPrototypeEvery,
ArrayPrototypeJoin,
ArrayPrototypePush,
ArrayPrototypePushApply,
ArrayPrototypeShift,
Expand DownExpand Up@@ -1668,6 +1669,17 @@ class Test extends AsyncResource {
details.passed_on_attempt = this.passedAttempt;
}

// Generate classname from suite hierarchy for JUnit reporter
if (this.parent && this.parent !== this.root) {
const parts = [];
for (let t = this.parent; t !== t.root; t = t.parent) {
ArrayPrototypeUnshift(parts, t.name);
}
if (parts.length > 0) {
details.classname = ArrayPrototypeJoin(parts, '.');
}
}

return { __proto__: null, details, directive };
}

Expand Down
2 changes: 2 additions & 0 deletions lib/internal/test_runner/tests_stream.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ class TestsStream extends Readable {
parentId,
details,
tags: ArrayPrototypeSlice(tags),
...(details.classname && { __proto__: null, classname: details.classname }),
...loc,
...directive,
});
Expand All@@ -60,6 +61,7 @@ class TestsStream extends Readable {
parentId,
details,
tags: ArrayPrototypeSlice(tags),
...(details.classname && { __proto__: null, classname: details.classname }),
...loc,
...directive,
});
Expand Down
19 changes: 19 additions & 0 deletions test/fixtures/test-runner/output/junit_classname_hierarchy.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
'use strict';
require('../../../common');
const { suite, test } = require('node:test');

suite('Math', () => {
suite('Addition', () => {
test('adds positive numbers', () => {});
});

suite('Multiplication', () => {
test('multiplies positive numbers', () => {});
});
});

suite('String', () => {
test('concatenates strings', () => {});
});

test('standalone test', () => {});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<testsuites>
<testsuite name="Math" time="*" disabled="0" errors="0" tests="2" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testsuite name="Addition" time="*" disabled="0" errors="0" tests="1" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="adds positive numbers" time="*" classname="Math.Addition" file="*"/>
</testsuite>
<testsuite name="Multiplication" time="*" disabled="0" errors="0" tests="1" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="multiplies positive numbers" time="*" classname="Math.Multiplication" file="*"/>
</testsuite>
</testsuite>
<testsuite name="String" time="*" disabled="0" errors="0" tests="1" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="concatenates strings" time="*" classname="String" file="*"/>
</testsuite>
<testcase name="standalone test" time="*" classname="test" file="*"/>
<!-- tests 4 -->
<!-- suites 4 -->
<!-- pass 4 -->
<!-- fail 0 -->
<!-- cancelled 0 -->
<!-- skipped 0 -->
<!-- todo 0 -->
<!-- duration_ms * -->
</testsuites>
24 changes: 12 additions & 12 deletions test/fixtures/test-runner/output/junit_reporter.snapshot
Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,7 @@ true !== false
<testcase name="immediate reject - passes but warns" time="*" classname="test" file="*"/>
<testcase name="immediate resolve pass" time="*" classname="test" file="*"/>
<testsuite name="subtest sync throw fail" time="*" disabled="0" errors="0" tests="1" failures="1" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="+sync throw fail" time="*" classname="test" file="*" failure="thrown from subtest sync throw fail">
<testcase name="+sync throw fail" time="*" classname="subtest sync throw fail" file="*" failure="thrown from subtest sync throw fail">
<failure type="testCodeFailure" message="thrown from subtest sync throw fail">
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fail
at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:125:11)
Expand All@@ -152,15 +152,15 @@ Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fail
</failure>
</testcase>
<testsuite name="level 0a" time="*" disabled="0" errors="0" tests="4" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="level 1a" time="*" classname="test" file="*"/>
<testcase name="level 1b" time="*" classname="test" file="*"/>
<testcase name="level 1c" time="*" classname="test" file="*"/>
<testcase name="level 1d" time="*" classname="test" file="*"/>
<testcase name="level 1a" time="*" classname="level 0a" file="*"/>
<testcase name="level 1b" time="*" classname="level 0a" file="*"/>
<testcase name="level 1c" time="*" classname="level 0a" file="*"/>
<testcase name="level 1d" time="*" classname="level 0a" file="*"/>
</testsuite>
<testsuite name="top level" time="*" disabled="0" errors="0" tests="2" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="+long running" time="*" classname="test" file="*"/>
<testcase name="+long running" time="*" classname="top level" file="*"/>
<testsuite name="+short running" time="*" disabled="0" errors="0" tests="1" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="++short running" time="*" classname="test" file="*"/>
<testcase name="++short running" time="*" classname="top level.+short running" file="*"/>
</testsuite>
</testsuite>
<testcase name="invalid subtest - pass but subtest fails" time="*" classname="test" file="*"/>
Expand DownExpand Up@@ -267,9 +267,9 @@ Error [ERR_TEST_FAILURE]: thrown from callback async throw
</testcase>
<testcase name="callback async throw after done" time="*" classname="test" file="*"/>
<testsuite name="only is set on subtests but not in only mode" time="*" disabled="0" errors="0" tests="3" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="running subtest 1" time="*" classname="test" file="*"/>
<testcase name="running subtest 3" time="*" classname="test" file="*"/>
<testcase name="running subtest 4" time="*" classname="test" file="*"/>
<testcase name="running subtest 1" time="*" classname="only is set on subtests but not in only mode" file="*"/>
<testcase name="running subtest 3" time="*" classname="only is set on subtests but not in only mode" file="*"/>
<testcase name="running subtest 4" time="*" classname="only is set on subtests but not in only mode" file="*"/>
</testsuite>
<testcase name="custom inspect symbol fail" time="*" classname="test" file="*" failure="customized">
<failure type="testCodeFailure" message="customized">
Expand All@@ -289,7 +289,7 @@ Error [ERR_TEST_FAILURE]: thrown from callback async throw
</failure>
</testcase>
<testsuite name="subtest sync throw fails" time="*" disabled="0" errors="0" tests="2" failures="2" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="sync throw fails at first" time="*" classname="test" file="*" failure="thrown from subtest sync throw fails at first">
<testcase name="sync throw fails at first" time="*" classname="subtest sync throw fails" file="*" failure="thrown from subtest sync throw fails at first">
<failure type="testCodeFailure" message="thrown from subtest sync throw fails at first">
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at first
at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:334:11)
Expand All@@ -304,7 +304,7 @@ Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at first
}
</failure>
</testcase>
<testcase name="sync throw fails at second" time="*" classname="test" file="*" failure="thrown from subtest sync throw fails at second">
<testcase name="sync throw fails at second" time="*" classname="subtest sync throw fails" file="*" failure="thrown from subtest sync throw fails at second">
<failure type="testCodeFailure" message="thrown from subtest sync throw fails at second">
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at second
at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:337:11) {
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-runner-reporters.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -207,7 +207,7 @@ describe('node:test reporters', { concurrency: true }, () => {
assert.match(timestamp, /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/);
assert.ok(!Number.isNaN(Date.parse(timestamp)), `expected a valid date, got ${timestamp}`);
assert.match(fileContents, /<testcase .*name="failing".*>\s*<failure .*type="testCodeFailure".*message="error".*>/);
assert.match(fileContents, /<testcase .*name="ok".*classname="test".*\/>/);
assert.match(fileContents, /<testcase .*name="ok".*classname="nested".*\/>/);
assert.match(fileContents, /<testcase .*name="top level".*classname="test".*\/>/);
});
});
12 changes: 12 additions & 0 deletions test/test-runner/test-output-junit-classname-hierarchy.mjs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
// Test that the output of test-runner/output/junit_classname_hierarchy.js matches
// test-runner/output/junit_classname_hierarchy.snapshot
import '../common/index.mjs';
import * as fixtures from '../common/fixtures.mjs';
import { spawnAndAssert, junitTransform, ensureCwdIsProjectRoot } from '../common/assertSnapshot.js';

ensureCwdIsProjectRoot();
await spawnAndAssert(
fixtures.path('test-runner/output/junit_classname_hierarchy.js'),
junitTransform,
{ flags: ['--test-reporter=junit'] },
);
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions lib/internal/test_runner/test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
const {
ArrayFrom,
ArrayPrototypeEvery,
ArrayPrototypeJoin,
ArrayPrototypePush,
ArrayPrototypePushApply,
ArrayPrototypeShift,
Expand DownExpand Up@@ -1668,6 +1669,17 @@ class Test extends AsyncResource {
details.passed_on_attempt = this.passedAttempt;
}

// Generate classname from suite hierarchy for JUnit reporter
if (this.parent && this.parent !== this.root) {
const parts = [];
for (let t = this.parent; t !== t.root; t = t.parent) {
ArrayPrototypeUnshift(parts, t.name);
}
if (parts.length > 0) {
details.classname = ArrayPrototypeJoin(parts, '.');
}
}

return { __proto__: null, details, directive };
}

Expand Down
2 changes: 2 additions & 0 deletions lib/internal/test_runner/tests_stream.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ class TestsStream extends Readable {
parentId,
details,
tags: ArrayPrototypeSlice(tags),
...(details.classname && { __proto__: null, classname: details.classname }),
...loc,
...directive,
});
Expand All@@ -60,6 +61,7 @@ class TestsStream extends Readable {
parentId,
details,
tags: ArrayPrototypeSlice(tags),
...(details.classname && { __proto__: null, classname: details.classname }),
...loc,
...directive,
});
Expand Down
19 changes: 19 additions & 0 deletions test/fixtures/test-runner/output/junit_classname_hierarchy.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
'use strict';
require('../../../common');
const { suite, test } = require('node:test');

suite('Math', () => {
suite('Addition', () => {
test('adds positive numbers', () => {});
});

suite('Multiplication', () => {
test('multiplies positive numbers', () => {});
});
});

suite('String', () => {
test('concatenates strings', () => {});
});

test('standalone test', () => {});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<testsuites>
<testsuite name="Math" time="*" disabled="0" errors="0" tests="2" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testsuite name="Addition" time="*" disabled="0" errors="0" tests="1" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="adds positive numbers" time="*" classname="Math.Addition" file="*"/>
</testsuite>
<testsuite name="Multiplication" time="*" disabled="0" errors="0" tests="1" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="multiplies positive numbers" time="*" classname="Math.Multiplication" file="*"/>
</testsuite>
</testsuite>
<testsuite name="String" time="*" disabled="0" errors="0" tests="1" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="concatenates strings" time="*" classname="String" file="*"/>
</testsuite>
<testcase name="standalone test" time="*" classname="test" file="*"/>
<!-- tests 4 -->
<!-- suites 4 -->
<!-- pass 4 -->
<!-- fail 0 -->
<!-- cancelled 0 -->
<!-- skipped 0 -->
<!-- todo 0 -->
<!-- duration_ms * -->
</testsuites>
24 changes: 12 additions & 12 deletions test/fixtures/test-runner/output/junit_reporter.snapshot
Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,7 @@ true !== false
<testcase name="immediate reject - passes but warns" time="*" classname="test" file="*"/>
<testcase name="immediate resolve pass" time="*" classname="test" file="*"/>
<testsuite name="subtest sync throw fail" time="*" disabled="0" errors="0" tests="1" failures="1" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="+sync throw fail" time="*" classname="test" file="*" failure="thrown from subtest sync throw fail">
<testcase name="+sync throw fail" time="*" classname="subtest sync throw fail" file="*" failure="thrown from subtest sync throw fail">
<failure type="testCodeFailure" message="thrown from subtest sync throw fail">
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fail
at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:125:11)
Expand All@@ -152,15 +152,15 @@ Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fail
</failure>
</testcase>
<testsuite name="level 0a" time="*" disabled="0" errors="0" tests="4" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="level 1a" time="*" classname="test" file="*"/>
<testcase name="level 1b" time="*" classname="test" file="*"/>
<testcase name="level 1c" time="*" classname="test" file="*"/>
<testcase name="level 1d" time="*" classname="test" file="*"/>
<testcase name="level 1a" time="*" classname="level 0a" file="*"/>
<testcase name="level 1b" time="*" classname="level 0a" file="*"/>
<testcase name="level 1c" time="*" classname="level 0a" file="*"/>
<testcase name="level 1d" time="*" classname="level 0a" file="*"/>
</testsuite>
<testsuite name="top level" time="*" disabled="0" errors="0" tests="2" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="+long running" time="*" classname="test" file="*"/>
<testcase name="+long running" time="*" classname="top level" file="*"/>
<testsuite name="+short running" time="*" disabled="0" errors="0" tests="1" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="++short running" time="*" classname="test" file="*"/>
<testcase name="++short running" time="*" classname="top level.+short running" file="*"/>
</testsuite>
</testsuite>
<testcase name="invalid subtest - pass but subtest fails" time="*" classname="test" file="*"/>
Expand DownExpand Up@@ -267,9 +267,9 @@ Error [ERR_TEST_FAILURE]: thrown from callback async throw
</testcase>
<testcase name="callback async throw after done" time="*" classname="test" file="*"/>
<testsuite name="only is set on subtests but not in only mode" time="*" disabled="0" errors="0" tests="3" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="running subtest 1" time="*" classname="test" file="*"/>
<testcase name="running subtest 3" time="*" classname="test" file="*"/>
<testcase name="running subtest 4" time="*" classname="test" file="*"/>
<testcase name="running subtest 1" time="*" classname="only is set on subtests but not in only mode" file="*"/>
<testcase name="running subtest 3" time="*" classname="only is set on subtests but not in only mode" file="*"/>
<testcase name="running subtest 4" time="*" classname="only is set on subtests but not in only mode" file="*"/>
</testsuite>
<testcase name="custom inspect symbol fail" time="*" classname="test" file="*" failure="customized">
<failure type="testCodeFailure" message="customized">
Expand All@@ -289,7 +289,7 @@ Error [ERR_TEST_FAILURE]: thrown from callback async throw
</failure>
</testcase>
<testsuite name="subtest sync throw fails" time="*" disabled="0" errors="0" tests="2" failures="2" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="sync throw fails at first" time="*" classname="test" file="*" failure="thrown from subtest sync throw fails at first">
<testcase name="sync throw fails at first" time="*" classname="subtest sync throw fails" file="*" failure="thrown from subtest sync throw fails at first">
<failure type="testCodeFailure" message="thrown from subtest sync throw fails at first">
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at first
at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:334:11)
Expand All@@ -304,7 +304,7 @@ Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at first
}
</failure>
</testcase>
<testcase name="sync throw fails at second" time="*" classname="test" file="*" failure="thrown from subtest sync throw fails at second">
<testcase name="sync throw fails at second" time="*" classname="subtest sync throw fails" file="*" failure="thrown from subtest sync throw fails at second">
<failure type="testCodeFailure" message="thrown from subtest sync throw fails at second">
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at second
at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:337:11) {
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-runner-reporters.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -207,7 +207,7 @@ describe('node:test reporters', { concurrency: true }, () => {
assert.match(timestamp, /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/);
assert.ok(!Number.isNaN(Date.parse(timestamp)), `expected a valid date, got ${timestamp}`);
assert.match(fileContents, /<testcase .*name="failing".*>\s*<failure .*type="testCodeFailure".*message="error".*>/);
assert.match(fileContents, /<testcase .*name="ok".*classname="test".*\/>/);
assert.match(fileContents, /<testcase .*name="ok".*classname="nested".*\/>/);
assert.match(fileContents, /<testcase .*name="top level".*classname="test".*\/>/);
});
});
12 changes: 12 additions & 0 deletions test/test-runner/test-output-junit-classname-hierarchy.mjs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
// Test that the output of test-runner/output/junit_classname_hierarchy.js matches
// test-runner/output/junit_classname_hierarchy.snapshot
import '../common/index.mjs';
import * as fixtures from '../common/fixtures.mjs';
import { spawnAndAssert, junitTransform, ensureCwdIsProjectRoot } from '../common/assertSnapshot.js';

ensureCwdIsProjectRoot();
await spawnAndAssert(
fixtures.path('test-runner/output/junit_classname_hierarchy.js'),
junitTransform,
{ flags: ['--test-reporter=junit'] },
);
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions lib/internal/test_runner/test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
const {
ArrayFrom,
ArrayPrototypeEvery,
ArrayPrototypeJoin,
ArrayPrototypePush,
ArrayPrototypePushApply,
ArrayPrototypeShift,
Expand DownExpand Up@@ -1668,6 +1669,17 @@ class Test extends AsyncResource {
details.passed_on_attempt = this.passedAttempt;
}

// Generate classname from suite hierarchy for JUnit reporter
if (this.parent && this.parent !== this.root) {
const parts = [];
for (let t = this.parent; t !== t.root; t = t.parent) {
ArrayPrototypeUnshift(parts, t.name);
}
if (parts.length > 0) {
details.classname = ArrayPrototypeJoin(parts, '.');
}
}

return { __proto__: null, details, directive };
}

Expand Down
2 changes: 2 additions & 0 deletions lib/internal/test_runner/tests_stream.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ class TestsStream extends Readable {
parentId,
details,
tags: ArrayPrototypeSlice(tags),
...(details.classname && { __proto__: null, classname: details.classname }),
...loc,
...directive,
});
Expand All@@ -60,6 +61,7 @@ class TestsStream extends Readable {
parentId,
details,
tags: ArrayPrototypeSlice(tags),
...(details.classname && { __proto__: null, classname: details.classname }),
...loc,
...directive,
});
Expand Down
19 changes: 19 additions & 0 deletions test/fixtures/test-runner/output/junit_classname_hierarchy.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
'use strict';
require('../../../common');
const { suite, test } = require('node:test');

suite('Math', () => {
suite('Addition', () => {
test('adds positive numbers', () => {});
});

suite('Multiplication', () => {
test('multiplies positive numbers', () => {});
});
});

suite('String', () => {
test('concatenates strings', () => {});
});

test('standalone test', () => {});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<testsuites>
<testsuite name="Math" time="*" disabled="0" errors="0" tests="2" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testsuite name="Addition" time="*" disabled="0" errors="0" tests="1" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="adds positive numbers" time="*" classname="Math.Addition" file="*"/>
</testsuite>
<testsuite name="Multiplication" time="*" disabled="0" errors="0" tests="1" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="multiplies positive numbers" time="*" classname="Math.Multiplication" file="*"/>
</testsuite>
</testsuite>
<testsuite name="String" time="*" disabled="0" errors="0" tests="1" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="concatenates strings" time="*" classname="String" file="*"/>
</testsuite>
<testcase name="standalone test" time="*" classname="test" file="*"/>
<!-- tests 4 -->
<!-- suites 4 -->
<!-- pass 4 -->
<!-- fail 0 -->
<!-- cancelled 0 -->
<!-- skipped 0 -->
<!-- todo 0 -->
<!-- duration_ms * -->
</testsuites>
24 changes: 12 additions & 12 deletions test/fixtures/test-runner/output/junit_reporter.snapshot
Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,7 @@ true !== false
<testcase name="immediate reject - passes but warns" time="*" classname="test" file="*"/>
<testcase name="immediate resolve pass" time="*" classname="test" file="*"/>
<testsuite name="subtest sync throw fail" time="*" disabled="0" errors="0" tests="1" failures="1" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="+sync throw fail" time="*" classname="test" file="*" failure="thrown from subtest sync throw fail">
<testcase name="+sync throw fail" time="*" classname="subtest sync throw fail" file="*" failure="thrown from subtest sync throw fail">
<failure type="testCodeFailure" message="thrown from subtest sync throw fail">
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fail
at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:125:11)
Expand All@@ -152,15 +152,15 @@ Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fail
</failure>
</testcase>
<testsuite name="level 0a" time="*" disabled="0" errors="0" tests="4" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="level 1a" time="*" classname="test" file="*"/>
<testcase name="level 1b" time="*" classname="test" file="*"/>
<testcase name="level 1c" time="*" classname="test" file="*"/>
<testcase name="level 1d" time="*" classname="test" file="*"/>
<testcase name="level 1a" time="*" classname="level 0a" file="*"/>
<testcase name="level 1b" time="*" classname="level 0a" file="*"/>
<testcase name="level 1c" time="*" classname="level 0a" file="*"/>
<testcase name="level 1d" time="*" classname="level 0a" file="*"/>
</testsuite>
<testsuite name="top level" time="*" disabled="0" errors="0" tests="2" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="+long running" time="*" classname="test" file="*"/>
<testcase name="+long running" time="*" classname="top level" file="*"/>
<testsuite name="+short running" time="*" disabled="0" errors="0" tests="1" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="++short running" time="*" classname="test" file="*"/>
<testcase name="++short running" time="*" classname="top level.+short running" file="*"/>
</testsuite>
</testsuite>
<testcase name="invalid subtest - pass but subtest fails" time="*" classname="test" file="*"/>
Expand DownExpand Up@@ -267,9 +267,9 @@ Error [ERR_TEST_FAILURE]: thrown from callback async throw
</testcase>
<testcase name="callback async throw after done" time="*" classname="test" file="*"/>
<testsuite name="only is set on subtests but not in only mode" time="*" disabled="0" errors="0" tests="3" failures="0" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="running subtest 1" time="*" classname="test" file="*"/>
<testcase name="running subtest 3" time="*" classname="test" file="*"/>
<testcase name="running subtest 4" time="*" classname="test" file="*"/>
<testcase name="running subtest 1" time="*" classname="only is set on subtests but not in only mode" file="*"/>
<testcase name="running subtest 3" time="*" classname="only is set on subtests but not in only mode" file="*"/>
<testcase name="running subtest 4" time="*" classname="only is set on subtests but not in only mode" file="*"/>
</testsuite>
<testcase name="custom inspect symbol fail" time="*" classname="test" file="*" failure="customized">
<failure type="testCodeFailure" message="customized">
Expand All@@ -289,7 +289,7 @@ Error [ERR_TEST_FAILURE]: thrown from callback async throw
</failure>
</testcase>
<testsuite name="subtest sync throw fails" time="*" disabled="0" errors="0" tests="2" failures="2" skipped="0" timestamp="*" hostname="HOSTNAME">
<testcase name="sync throw fails at first" time="*" classname="test" file="*" failure="thrown from subtest sync throw fails at first">
<testcase name="sync throw fails at first" time="*" classname="subtest sync throw fails" file="*" failure="thrown from subtest sync throw fails at first">
<failure type="testCodeFailure" message="thrown from subtest sync throw fails at first">
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at first
at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:334:11)
Expand All@@ -304,7 +304,7 @@ Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at first
}
</failure>
</testcase>
<testcase name="sync throw fails at second" time="*" classname="test" file="*" failure="thrown from subtest sync throw fails at second">
<testcase name="sync throw fails at second" time="*" classname="subtest sync throw fails" file="*" failure="thrown from subtest sync throw fails at second">
<failure type="testCodeFailure" message="thrown from subtest sync throw fails at second">
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at second
at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:337:11) {
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-runner-reporters.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -207,7 +207,7 @@ describe('node:test reporters', { concurrency: true }, () => {
assert.match(timestamp, /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/);
assert.ok(!Number.isNaN(Date.parse(timestamp)), `expected a valid date, got ${timestamp}`);
assert.match(fileContents, /<testcase .*name="failing".*>\s*<failure .*type="testCodeFailure".*message="error".*>/);
assert.match(fileContents, /<testcase .*name="ok".*classname="test".*\/>/);
assert.match(fileContents, /<testcase .*name="ok".*classname="nested".*\/>/);
assert.match(fileContents, /<testcase .*name="top level".*classname="test".*\/>/);
});
});
12 changes: 12 additions & 0 deletions test/test-runner/test-output-junit-classname-hierarchy.mjs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
// Test that the output of test-runner/output/junit_classname_hierarchy.js matches
// test-runner/output/junit_classname_hierarchy.snapshot
import '../common/index.mjs';
import * as fixtures from '../common/fixtures.mjs';
import { spawnAndAssert, junitTransform, ensureCwdIsProjectRoot } from '../common/assertSnapshot.js';

ensureCwdIsProjectRoot();
await spawnAndAssert(
fixtures.path('test-runner/output/junit_classname_hierarchy.js'),
junitTransform,
{ flags: ['--test-reporter=junit'] },
);
Loading