Commit 400d598

Browse files
mag123caduh95
mag123c
authored and
aduh95
committed
test_runner: add classname hierarchy for JUnit reporter
Signed-off-by: mag123c <diehreo@gmail.com> PR-URL: #60220Fixes: #59417 Reviewed-By: Chemi Atlow <chemi@atlow.co.il> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Pietro Marchini <pietro.marchini94@gmail.com> Reviewed-By: Moshe Atlow <moshe@atlow.co.il> Reviewed-By: Aviv Keller <me@aviv.sh>
1 parent 41edd2f commit 400d598

7 files changed

Lines changed: 81 additions & 13 deletions

File tree

‎lib/internal/test_runner/test.js‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
const{
33
ArrayFrom,
44
ArrayPrototypeEvery,
5+
ArrayPrototypeJoin,
56
ArrayPrototypePush,
67
ArrayPrototypePushApply,
78
ArrayPrototypeShift,
@@ -1672,6 +1673,17 @@ class Test extends AsyncResource {
16721673
details.passed_on_attempt=this.passedAttempt;
16731674
}
16741675

1676+
// Generate classname from suite hierarchy for JUnit reporter
1677+
if(this.parent&&this.parent!==this.root){
1678+
constparts=[];
1679+
for(lett=this.parent;t!==t.root;t=t.parent){
1680+
ArrayPrototypeUnshift(parts,t.name);
1681+
}
1682+
if(parts.length>0){
1683+
details.classname=ArrayPrototypeJoin(parts,'.');
1684+
}
1685+
}
1686+
16751687
return{__proto__: null, details, directive };
16761688
}
16771689

‎lib/internal/test_runner/tests_stream.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ class TestsStream extends Readable {
4545
parentId,
4646
details,
4747
tags: ArrayPrototypeSlice(tags),
48+
...(details.classname&&{__proto__: null,classname: details.classname}),
4849
...loc,
4950
...directive,
5051
});
@@ -60,6 +61,7 @@ class TestsStream extends Readable {
6061
parentId,
6162
details,
6263
tags: ArrayPrototypeSlice(tags),
64+
...(details.classname&&{__proto__: null,classname: details.classname}),
6365
...loc,
6466
...directive,
6567
});

‎test/fixtures/test-runner/output/junit_classname_hierarchy.js‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
'use strict';
2+
require('../../../common');
3+
const{ suite, test }=require('node:test');
4+
5+
suite('Math',()=>{
6+
suite('Addition',()=>{
7+
test('adds positive numbers',()=>{});
8+
});
9+
10+
suite('Multiplication',()=>{
11+
test('multiplies positive numbers',()=>{});
12+
});
13+
});
14+
15+
suite('String',()=>{
16+
test('concatenates strings',()=>{});
17+
});
18+
19+
test('standalone test',()=>{});

‎test/fixtures/test-runner/output/junit_classname_hierarchy.snapshot‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<testsuites>
3+
<testsuitename="Math"time="*"disabled="0"errors="0"tests="2"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
4+
<testsuitename="Addition"time="*"disabled="0"errors="0"tests="1"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
5+
<testcasename="adds positive numbers"time="*"classname="Math.Addition"file="*"/>
6+
</testsuite>
7+
<testsuitename="Multiplication"time="*"disabled="0"errors="0"tests="1"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
8+
<testcasename="multiplies positive numbers"time="*"classname="Math.Multiplication"file="*"/>
9+
</testsuite>
10+
</testsuite>
11+
<testsuitename="String"time="*"disabled="0"errors="0"tests="1"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
12+
<testcasename="concatenates strings"time="*"classname="String"file="*"/>
13+
</testsuite>
14+
<testcasename="standalone test"time="*"classname="test"file="*"/>
15+
<!-- tests 4 -->
16+
<!-- suites 4 -->
17+
<!-- pass 4 -->
18+
<!-- fail 0 -->
19+
<!-- cancelled 0 -->
20+
<!-- skipped 0 -->
21+
<!-- todo 0 -->
22+
<!-- duration_ms * -->
23+
</testsuites>

‎test/fixtures/test-runner/output/junit_reporter.snapshot‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ true !== false
129129
<testcasename="immediate reject - passes but warns"time="*"classname="test"file="*"/>
130130
<testcasename="immediate resolve pass"time="*"classname="test"file="*"/>
131131
<testsuitename="subtest sync throw fail"time="*"disabled="0"errors="0"tests="1"failures="1"skipped="0"timestamp="*"hostname="HOSTNAME">
132-
<testcasename="+sync throw fail"time="*"classname="test"file="*"failure="thrown from subtest sync throw fail">
132+
<testcasename="+sync throw fail"time="*"classname="subtest sync throw fail"file="*"failure="thrown from subtest sync throw fail">
133133
<failuretype="testCodeFailure"message="thrown from subtest sync throw fail">
134134
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fail
135135
at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:125:11)
@@ -152,15 +152,15 @@ Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fail
152152
</failure>
153153
</testcase>
154154
<testsuitename="level 0a"time="*"disabled="0"errors="0"tests="4"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
155-
<testcasename="level 1a"time="*"classname="test"file="*"/>
156-
<testcasename="level 1b"time="*"classname="test"file="*"/>
157-
<testcasename="level 1c"time="*"classname="test"file="*"/>
158-
<testcasename="level 1d"time="*"classname="test"file="*"/>
155+
<testcasename="level 1a"time="*"classname="level 0a"file="*"/>
156+
<testcasename="level 1b"time="*"classname="level 0a"file="*"/>
157+
<testcasename="level 1c"time="*"classname="level 0a"file="*"/>
158+
<testcasename="level 1d"time="*"classname="level 0a"file="*"/>
159159
</testsuite>
160160
<testsuitename="top level"time="*"disabled="0"errors="0"tests="2"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
161-
<testcasename="+long running"time="*"classname="test"file="*"/>
161+
<testcasename="+long running"time="*"classname="top level"file="*"/>
162162
<testsuitename="+short running"time="*"disabled="0"errors="0"tests="1"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
163-
<testcasename="++short running"time="*"classname="test"file="*"/>
163+
<testcasename="++short running"time="*"classname="top level.+short running"file="*"/>
164164
</testsuite>
165165
</testsuite>
166166
<testcasename="invalid subtest - pass but subtest fails"time="*"classname="test"file="*"/>
@@ -267,9 +267,9 @@ Error [ERR_TEST_FAILURE]: thrown from callback async throw
267267
</testcase>
268268
<testcasename="callback async throw after done"time="*"classname="test"file="*"/>
269269
<testsuitename="only is set on subtests but not in only mode"time="*"disabled="0"errors="0"tests="3"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
270-
<testcasename="running subtest 1"time="*"classname="test"file="*"/>
271-
<testcasename="running subtest 3"time="*"classname="test"file="*"/>
272-
<testcasename="running subtest 4"time="*"classname="test"file="*"/>
270+
<testcasename="running subtest 1"time="*"classname="only is set on subtests but not in only mode"file="*"/>
271+
<testcasename="running subtest 3"time="*"classname="only is set on subtests but not in only mode"file="*"/>
272+
<testcasename="running subtest 4"time="*"classname="only is set on subtests but not in only mode"file="*"/>
273273
</testsuite>
274274
<testcasename="custom inspect symbol fail"time="*"classname="test"file="*"failure="customized">
275275
<failuretype="testCodeFailure"message="customized">
@@ -289,7 +289,7 @@ Error [ERR_TEST_FAILURE]: thrown from callback async throw
289289
</failure>
290290
</testcase>
291291
<testsuitename="subtest sync throw fails"time="*"disabled="0"errors="0"tests="2"failures="2"skipped="0"timestamp="*"hostname="HOSTNAME">
292-
<testcasename="sync throw fails at first"time="*"classname="test"file="*"failure="thrown from subtest sync throw fails at first">
292+
<testcasename="sync throw fails at first"time="*"classname="subtest sync throw fails"file="*"failure="thrown from subtest sync throw fails at first">
293293
<failuretype="testCodeFailure"message="thrown from subtest sync throw fails at first">
294294
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at first
295295
at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:334:11)
@@ -304,7 +304,7 @@ Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at first
304304
}
305305
</failure>
306306
</testcase>
307-
<testcasename="sync throw fails at second"time="*"classname="test"file="*"failure="thrown from subtest sync throw fails at second">
307+
<testcasename="sync throw fails at second"time="*"classname="subtest sync throw fails"file="*"failure="thrown from subtest sync throw fails at second">
308308
<failuretype="testCodeFailure"message="thrown from subtest sync throw fails at second">
309309
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at second
310310
at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:337:11) {

‎test/parallel/test-runner-reporters.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ describe('node:test reporters', { concurrency: true }, () => {
207207
assert.match(timestamp,/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/);
208208
assert.ok(!Number.isNaN(Date.parse(timestamp)),`expected a valid date, got ${timestamp}`);
209209
assert.match(fileContents,/<testcase.*name="failing".*>\s*<failure.*type="testCodeFailure".*message="error".*>/);
210-
assert.match(fileContents,/<testcase.*name="ok".*classname="test".*\/>/);
210+
assert.match(fileContents,/<testcase.*name="ok".*classname="nested".*\/>/);
211211
assert.match(fileContents,/<testcase.*name="toplevel".*classname="test".*\/>/);
212212
});
213213
});

‎test/test-runner/test-output-junit-classname-hierarchy.mjs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
// Test that the output of test-runner/output/junit_classname_hierarchy.js matches
2+
// test-runner/output/junit_classname_hierarchy.snapshot
3+
import'../common/index.mjs';
4+
import*asfixturesfrom'../common/fixtures.mjs';
5+
import{spawnAndAssert,junitTransform,ensureCwdIsProjectRoot}from'../common/assertSnapshot.js';
6+
7+
ensureCwdIsProjectRoot();
8+
awaitspawnAndAssert(
9+
fixtures.path('test-runner/output/junit_classname_hierarchy.js'),
10+
junitTransform,
11+
{flags: ['--test-reporter=junit']},
12+
);

0 commit comments

Comments
 (0)
, '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
Commit 400d598
Browse files
mag123caduh95
mag123c
authored and
aduh95
committed
test_runner: add classname hierarchy for JUnit reporter
Signed-off-by: mag123c <diehreo@gmail.com>
PR-URL: #60220Fixes: #59417
Reviewed-By: Chemi Atlow <chemi@atlow.co.il>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Pietro Marchini <pietro.marchini94@gmail.com>
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Reviewed-By: Aviv Keller <me@aviv.sh>
1 parent 41edd2f commit 400d598
7 files changed
Lines changed: 81 additions & 13 deletions
File tree
‎lib/internal/test_runner/test.js‎
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
const{
33
 ArrayFrom,
44
 ArrayPrototypeEvery,
5+
 ArrayPrototypeJoin,
56
 ArrayPrototypePush,
67
 ArrayPrototypePushApply,
78
 ArrayPrototypeShift,
@@ -1672,6 +1673,17 @@ class Test extends AsyncResource {
16721673
details.passed_on_attempt=this.passedAttempt;
16731674
}
16741675

1676+
// Generate classname from suite hierarchy for JUnit reporter
1677+
if(this.parent&&this.parent!==this.root){
1678+
constparts=[];
1679+
for(lett=this.parent;t!==t.root;t=t.parent){
1680+
ArrayPrototypeUnshift(parts,t.name);
1681+
}
1682+
if(parts.length>0){
1683+
details.classname=ArrayPrototypeJoin(parts,'.');
1684+
}
1685+
}
1686+
16751687
return{__proto__: null, details, directive };
16761688
}
16771689

‎lib/internal/test_runner/tests_stream.js‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ class TestsStream extends Readable {
4545
 parentId,
4646
 details,
4747
tags: ArrayPrototypeSlice(tags),
48+
 ...(details.classname&&{__proto__: null,classname: details.classname}),
4849
 ...loc,
4950
 ...directive,
5051
});
@@ -60,6 +61,7 @@ class TestsStream extends Readable {
6061
 parentId,
6162
 details,
6263
tags: ArrayPrototypeSlice(tags),
64+
 ...(details.classname&&{__proto__: null,classname: details.classname}),
6365
 ...loc,
6466
 ...directive,
6567
});
‎test/fixtures/test-runner/output/junit_classname_hierarchy.js‎
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
'use strict';
2+
require('../../../common');
3+
const{ suite, test }=require('node:test');
4+
5+
suite('Math',()=>{
6+
suite('Addition',()=>{
7+
test('adds positive numbers',()=>{});
8+
});
9+
10+
suite('Multiplication',()=>{
11+
test('multiplies positive numbers',()=>{});
12+
});
13+
});
14+
15+
suite('String',()=>{
16+
test('concatenates strings',()=>{});
17+
});
18+
19+
test('standalone test',()=>{});
‎test/fixtures/test-runner/output/junit_classname_hierarchy.snapshot‎
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<testsuites>
3+
	<testsuitename="Math"time="*"disabled="0"errors="0"tests="2"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
4+
 <testsuitename="Addition"time="*"disabled="0"errors="0"tests="1"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
5+
 <testcasename="adds positive numbers"time="*"classname="Math.Addition"file="*"/>
6+
 </testsuite>
7+
 <testsuitename="Multiplication"time="*"disabled="0"errors="0"tests="1"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
8+
 <testcasename="multiplies positive numbers"time="*"classname="Math.Multiplication"file="*"/>
9+
 </testsuite>
10+
	</testsuite>
11+
	<testsuitename="String"time="*"disabled="0"errors="0"tests="1"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
12+
 <testcasename="concatenates strings"time="*"classname="String"file="*"/>
13+
	</testsuite>
14+
	<testcasename="standalone test"time="*"classname="test"file="*"/>
15+
<!-- tests 4 -->
16+
<!-- suites 4 -->
17+
<!-- pass 4 -->
18+
<!-- fail 0 -->
19+
<!-- cancelled 0 -->
20+
<!-- skipped 0 -->
21+
<!-- todo 0 -->
22+
<!-- duration_ms * -->
23+
</testsuites>
‎test/fixtures/test-runner/output/junit_reporter.snapshot‎
Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ true !== false
129129
	<testcasename="immediate reject - passes but warns"time="*"classname="test"file="*"/>
130130
	<testcasename="immediate resolve pass"time="*"classname="test"file="*"/>
131131
	<testsuitename="subtest sync throw fail"time="*"disabled="0"errors="0"tests="1"failures="1"skipped="0"timestamp="*"hostname="HOSTNAME">
132-
 <testcasename="+sync throw fail"time="*"classname="test"file="*"failure="thrown from subtest sync throw fail">
132+
 <testcasename="+sync throw fail"time="*"classname="subtest sync throw fail"file="*"failure="thrown from subtest sync throw fail">
133133
 <failuretype="testCodeFailure"message="thrown from subtest sync throw fail">
134134
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fail
135135
 at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:125:11)
@@ -152,15 +152,15 @@ Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fail
152152
 </failure>
153153
	</testcase>
154154
	<testsuitename="level 0a"time="*"disabled="0"errors="0"tests="4"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
155-
 <testcasename="level 1a"time="*"classname="test"file="*"/>
156-
 <testcasename="level 1b"time="*"classname="test"file="*"/>
157-
 <testcasename="level 1c"time="*"classname="test"file="*"/>
158-
 <testcasename="level 1d"time="*"classname="test"file="*"/>
155+
 <testcasename="level 1a"time="*"classname="level 0a"file="*"/>
156+
 <testcasename="level 1b"time="*"classname="level 0a"file="*"/>
157+
 <testcasename="level 1c"time="*"classname="level 0a"file="*"/>
158+
 <testcasename="level 1d"time="*"classname="level 0a"file="*"/>
159159
	</testsuite>
160160
	<testsuitename="top level"time="*"disabled="0"errors="0"tests="2"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
161-
 <testcasename="+long running"time="*"classname="test"file="*"/>
161+
 <testcasename="+long running"time="*"classname="top level"file="*"/>
162162
 <testsuitename="+short running"time="*"disabled="0"errors="0"tests="1"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
163-
 <testcasename="++short running"time="*"classname="test"file="*"/>
163+
 <testcasename="++short running"time="*"classname="top level.+short running"file="*"/>
164164
 </testsuite>
165165
	</testsuite>
166166
	<testcasename="invalid subtest - pass but subtest fails"time="*"classname="test"file="*"/>
@@ -267,9 +267,9 @@ Error [ERR_TEST_FAILURE]: thrown from callback async throw
267267
	</testcase>
268268
	<testcasename="callback async throw after done"time="*"classname="test"file="*"/>
269269
	<testsuitename="only is set on subtests but not in only mode"time="*"disabled="0"errors="0"tests="3"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
270-
 <testcasename="running subtest 1"time="*"classname="test"file="*"/>
271-
 <testcasename="running subtest 3"time="*"classname="test"file="*"/>
272-
 <testcasename="running subtest 4"time="*"classname="test"file="*"/>
270+
 <testcasename="running subtest 1"time="*"classname="only is set on subtests but not in only mode"file="*"/>
271+
 <testcasename="running subtest 3"time="*"classname="only is set on subtests but not in only mode"file="*"/>
272+
 <testcasename="running subtest 4"time="*"classname="only is set on subtests but not in only mode"file="*"/>
273273
	</testsuite>
274274
	<testcasename="custom inspect symbol fail"time="*"classname="test"file="*"failure="customized">
275275
 <failuretype="testCodeFailure"message="customized">
@@ -289,7 +289,7 @@ Error [ERR_TEST_FAILURE]: thrown from callback async throw
289289
 </failure>
290290
	</testcase>
291291
	<testsuitename="subtest sync throw fails"time="*"disabled="0"errors="0"tests="2"failures="2"skipped="0"timestamp="*"hostname="HOSTNAME">
292-
 <testcasename="sync throw fails at first"time="*"classname="test"file="*"failure="thrown from subtest sync throw fails at first">
292+
 <testcasename="sync throw fails at first"time="*"classname="subtest sync throw fails"file="*"failure="thrown from subtest sync throw fails at first">
293293
 <failuretype="testCodeFailure"message="thrown from subtest sync throw fails at first">
294294
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at first
295295
 at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:334:11)
@@ -304,7 +304,7 @@ Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at first
304304
}
305305
 </failure>
306306
 </testcase>
307-
 <testcasename="sync throw fails at second"time="*"classname="test"file="*"failure="thrown from subtest sync throw fails at second">
307+
 <testcasename="sync throw fails at second"time="*"classname="subtest sync throw fails"file="*"failure="thrown from subtest sync throw fails at second">
308308
 <failuretype="testCodeFailure"message="thrown from subtest sync throw fails at second">
309309
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at second
310310
 at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:337:11) {
‎test/parallel/test-runner-reporters.js‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ describe('node:test reporters', { concurrency: true }, () => {
207207
assert.match(timestamp,/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/);
208208
assert.ok(!Number.isNaN(Date.parse(timestamp)),`expected a valid date, got ${timestamp}`);
209209
assert.match(fileContents,/<testcase.*name="failing".*>\s*<failure.*type="testCodeFailure".*message="error".*>/);
210-
assert.match(fileContents,/<testcase.*name="ok".*classname="test".*\/>/);
210+
assert.match(fileContents,/<testcase.*name="ok".*classname="nested".*\/>/);
211211
assert.match(fileContents,/<testcase.*name="toplevel".*classname="test".*\/>/);
212212
});
213213
});
‎test/test-runner/test-output-junit-classname-hierarchy.mjs‎
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
// Test that the output of test-runner/output/junit_classname_hierarchy.js matches
2+
// test-runner/output/junit_classname_hierarchy.snapshot
3+
import'../common/index.mjs';
4+
import*asfixturesfrom'../common/fixtures.mjs';
5+
import{spawnAndAssert,junitTransform,ensureCwdIsProjectRoot}from'../common/assertSnapshot.js';
6+
7+
ensureCwdIsProjectRoot();
8+
awaitspawnAndAssert(
9+
fixtures.path('test-runner/output/junit_classname_hierarchy.js'),
10+
junitTransform,
11+
{flags: ['--test-reporter=junit']},
12+
);
0 commit comments
Comments
 (0)

, '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
Commit 400d598
Browse files
mag123caduh95
mag123c
authored and
aduh95
committed
test_runner: add classname hierarchy for JUnit reporter
Signed-off-by: mag123c <diehreo@gmail.com>
PR-URL: #60220Fixes: #59417
Reviewed-By: Chemi Atlow <chemi@atlow.co.il>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Pietro Marchini <pietro.marchini94@gmail.com>
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Reviewed-By: Aviv Keller <me@aviv.sh>
1 parent 41edd2f commit 400d598
7 files changed
Lines changed: 81 additions & 13 deletions
File tree
‎lib/internal/test_runner/test.js‎
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
const{
33
 ArrayFrom,
44
 ArrayPrototypeEvery,
5+
 ArrayPrototypeJoin,
56
 ArrayPrototypePush,
67
 ArrayPrototypePushApply,
78
 ArrayPrototypeShift,
@@ -1672,6 +1673,17 @@ class Test extends AsyncResource {
16721673
details.passed_on_attempt=this.passedAttempt;
16731674
}
16741675

1676+
// Generate classname from suite hierarchy for JUnit reporter
1677+
if(this.parent&&this.parent!==this.root){
1678+
constparts=[];
1679+
for(lett=this.parent;t!==t.root;t=t.parent){
1680+
ArrayPrototypeUnshift(parts,t.name);
1681+
}
1682+
if(parts.length>0){
1683+
details.classname=ArrayPrototypeJoin(parts,'.');
1684+
}
1685+
}
1686+
16751687
return{__proto__: null, details, directive };
16761688
}
16771689

‎lib/internal/test_runner/tests_stream.js‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ class TestsStream extends Readable {
4545
 parentId,
4646
 details,
4747
tags: ArrayPrototypeSlice(tags),
48+
 ...(details.classname&&{__proto__: null,classname: details.classname}),
4849
 ...loc,
4950
 ...directive,
5051
});
@@ -60,6 +61,7 @@ class TestsStream extends Readable {
6061
 parentId,
6162
 details,
6263
tags: ArrayPrototypeSlice(tags),
64+
 ...(details.classname&&{__proto__: null,classname: details.classname}),
6365
 ...loc,
6466
 ...directive,
6567
});
‎test/fixtures/test-runner/output/junit_classname_hierarchy.js‎
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
'use strict';
2+
require('../../../common');
3+
const{ suite, test }=require('node:test');
4+
5+
suite('Math',()=>{
6+
suite('Addition',()=>{
7+
test('adds positive numbers',()=>{});
8+
});
9+
10+
suite('Multiplication',()=>{
11+
test('multiplies positive numbers',()=>{});
12+
});
13+
});
14+
15+
suite('String',()=>{
16+
test('concatenates strings',()=>{});
17+
});
18+
19+
test('standalone test',()=>{});
‎test/fixtures/test-runner/output/junit_classname_hierarchy.snapshot‎
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<testsuites>
3+
	<testsuitename="Math"time="*"disabled="0"errors="0"tests="2"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
4+
 <testsuitename="Addition"time="*"disabled="0"errors="0"tests="1"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
5+
 <testcasename="adds positive numbers"time="*"classname="Math.Addition"file="*"/>
6+
 </testsuite>
7+
 <testsuitename="Multiplication"time="*"disabled="0"errors="0"tests="1"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
8+
 <testcasename="multiplies positive numbers"time="*"classname="Math.Multiplication"file="*"/>
9+
 </testsuite>
10+
	</testsuite>
11+
	<testsuitename="String"time="*"disabled="0"errors="0"tests="1"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
12+
 <testcasename="concatenates strings"time="*"classname="String"file="*"/>
13+
	</testsuite>
14+
	<testcasename="standalone test"time="*"classname="test"file="*"/>
15+
<!-- tests 4 -->
16+
<!-- suites 4 -->
17+
<!-- pass 4 -->
18+
<!-- fail 0 -->
19+
<!-- cancelled 0 -->
20+
<!-- skipped 0 -->
21+
<!-- todo 0 -->
22+
<!-- duration_ms * -->
23+
</testsuites>
‎test/fixtures/test-runner/output/junit_reporter.snapshot‎
Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ true !== false
129129
	<testcasename="immediate reject - passes but warns"time="*"classname="test"file="*"/>
130130
	<testcasename="immediate resolve pass"time="*"classname="test"file="*"/>
131131
	<testsuitename="subtest sync throw fail"time="*"disabled="0"errors="0"tests="1"failures="1"skipped="0"timestamp="*"hostname="HOSTNAME">
132-
 <testcasename="+sync throw fail"time="*"classname="test"file="*"failure="thrown from subtest sync throw fail">
132+
 <testcasename="+sync throw fail"time="*"classname="subtest sync throw fail"file="*"failure="thrown from subtest sync throw fail">
133133
 <failuretype="testCodeFailure"message="thrown from subtest sync throw fail">
134134
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fail
135135
 at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:125:11)
@@ -152,15 +152,15 @@ Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fail
152152
 </failure>
153153
	</testcase>
154154
	<testsuitename="level 0a"time="*"disabled="0"errors="0"tests="4"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
155-
 <testcasename="level 1a"time="*"classname="test"file="*"/>
156-
 <testcasename="level 1b"time="*"classname="test"file="*"/>
157-
 <testcasename="level 1c"time="*"classname="test"file="*"/>
158-
 <testcasename="level 1d"time="*"classname="test"file="*"/>
155+
 <testcasename="level 1a"time="*"classname="level 0a"file="*"/>
156+
 <testcasename="level 1b"time="*"classname="level 0a"file="*"/>
157+
 <testcasename="level 1c"time="*"classname="level 0a"file="*"/>
158+
 <testcasename="level 1d"time="*"classname="level 0a"file="*"/>
159159
	</testsuite>
160160
	<testsuitename="top level"time="*"disabled="0"errors="0"tests="2"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
161-
 <testcasename="+long running"time="*"classname="test"file="*"/>
161+
 <testcasename="+long running"time="*"classname="top level"file="*"/>
162162
 <testsuitename="+short running"time="*"disabled="0"errors="0"tests="1"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
163-
 <testcasename="++short running"time="*"classname="test"file="*"/>
163+
 <testcasename="++short running"time="*"classname="top level.+short running"file="*"/>
164164
 </testsuite>
165165
	</testsuite>
166166
	<testcasename="invalid subtest - pass but subtest fails"time="*"classname="test"file="*"/>
@@ -267,9 +267,9 @@ Error [ERR_TEST_FAILURE]: thrown from callback async throw
267267
	</testcase>
268268
	<testcasename="callback async throw after done"time="*"classname="test"file="*"/>
269269
	<testsuitename="only is set on subtests but not in only mode"time="*"disabled="0"errors="0"tests="3"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
270-
 <testcasename="running subtest 1"time="*"classname="test"file="*"/>
271-
 <testcasename="running subtest 3"time="*"classname="test"file="*"/>
272-
 <testcasename="running subtest 4"time="*"classname="test"file="*"/>
270+
 <testcasename="running subtest 1"time="*"classname="only is set on subtests but not in only mode"file="*"/>
271+
 <testcasename="running subtest 3"time="*"classname="only is set on subtests but not in only mode"file="*"/>
272+
 <testcasename="running subtest 4"time="*"classname="only is set on subtests but not in only mode"file="*"/>
273273
	</testsuite>
274274
	<testcasename="custom inspect symbol fail"time="*"classname="test"file="*"failure="customized">
275275
 <failuretype="testCodeFailure"message="customized">
@@ -289,7 +289,7 @@ Error [ERR_TEST_FAILURE]: thrown from callback async throw
289289
 </failure>
290290
	</testcase>
291291
	<testsuitename="subtest sync throw fails"time="*"disabled="0"errors="0"tests="2"failures="2"skipped="0"timestamp="*"hostname="HOSTNAME">
292-
 <testcasename="sync throw fails at first"time="*"classname="test"file="*"failure="thrown from subtest sync throw fails at first">
292+
 <testcasename="sync throw fails at first"time="*"classname="subtest sync throw fails"file="*"failure="thrown from subtest sync throw fails at first">
293293
 <failuretype="testCodeFailure"message="thrown from subtest sync throw fails at first">
294294
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at first
295295
 at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:334:11)
@@ -304,7 +304,7 @@ Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at first
304304
}
305305
 </failure>
306306
 </testcase>
307-
 <testcasename="sync throw fails at second"time="*"classname="test"file="*"failure="thrown from subtest sync throw fails at second">
307+
 <testcasename="sync throw fails at second"time="*"classname="subtest sync throw fails"file="*"failure="thrown from subtest sync throw fails at second">
308308
 <failuretype="testCodeFailure"message="thrown from subtest sync throw fails at second">
309309
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at second
310310
 at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:337:11) {
‎test/parallel/test-runner-reporters.js‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ describe('node:test reporters', { concurrency: true }, () => {
207207
assert.match(timestamp,/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/);
208208
assert.ok(!Number.isNaN(Date.parse(timestamp)),`expected a valid date, got ${timestamp}`);
209209
assert.match(fileContents,/<testcase.*name="failing".*>\s*<failure.*type="testCodeFailure".*message="error".*>/);
210-
assert.match(fileContents,/<testcase.*name="ok".*classname="test".*\/>/);
210+
assert.match(fileContents,/<testcase.*name="ok".*classname="nested".*\/>/);
211211
assert.match(fileContents,/<testcase.*name="toplevel".*classname="test".*\/>/);
212212
});
213213
});
‎test/test-runner/test-output-junit-classname-hierarchy.mjs‎
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
// Test that the output of test-runner/output/junit_classname_hierarchy.js matches
2+
// test-runner/output/junit_classname_hierarchy.snapshot
3+
import'../common/index.mjs';
4+
import*asfixturesfrom'../common/fixtures.mjs';
5+
import{spawnAndAssert,junitTransform,ensureCwdIsProjectRoot}from'../common/assertSnapshot.js';
6+
7+
ensureCwdIsProjectRoot();
8+
awaitspawnAndAssert(
9+
fixtures.path('test-runner/output/junit_classname_hierarchy.js'),
10+
junitTransform,
11+
{flags: ['--test-reporter=junit']},
12+
);
0 commit comments
Comments
 (0)

, '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
Commit 400d598
Browse files
mag123caduh95
mag123c
authored and
aduh95
committed
test_runner: add classname hierarchy for JUnit reporter
Signed-off-by: mag123c <diehreo@gmail.com>
PR-URL: #60220Fixes: #59417
Reviewed-By: Chemi Atlow <chemi@atlow.co.il>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Pietro Marchini <pietro.marchini94@gmail.com>
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Reviewed-By: Aviv Keller <me@aviv.sh>
1 parent 41edd2f commit 400d598
7 files changed
Lines changed: 81 additions & 13 deletions
File tree
‎lib/internal/test_runner/test.js‎
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
const{
33
 ArrayFrom,
44
 ArrayPrototypeEvery,
5+
 ArrayPrototypeJoin,
56
 ArrayPrototypePush,
67
 ArrayPrototypePushApply,
78
 ArrayPrototypeShift,
@@ -1672,6 +1673,17 @@ class Test extends AsyncResource {
16721673
details.passed_on_attempt=this.passedAttempt;
16731674
}
16741675

1676+
// Generate classname from suite hierarchy for JUnit reporter
1677+
if(this.parent&&this.parent!==this.root){
1678+
constparts=[];
1679+
for(lett=this.parent;t!==t.root;t=t.parent){
1680+
ArrayPrototypeUnshift(parts,t.name);
1681+
}
1682+
if(parts.length>0){
1683+
details.classname=ArrayPrototypeJoin(parts,'.');
1684+
}
1685+
}
1686+
16751687
return{__proto__: null, details, directive };
16761688
}
16771689

‎lib/internal/test_runner/tests_stream.js‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ class TestsStream extends Readable {
4545
 parentId,
4646
 details,
4747
tags: ArrayPrototypeSlice(tags),
48+
 ...(details.classname&&{__proto__: null,classname: details.classname}),
4849
 ...loc,
4950
 ...directive,
5051
});
@@ -60,6 +61,7 @@ class TestsStream extends Readable {
6061
 parentId,
6162
 details,
6263
tags: ArrayPrototypeSlice(tags),
64+
 ...(details.classname&&{__proto__: null,classname: details.classname}),
6365
 ...loc,
6466
 ...directive,
6567
});
‎test/fixtures/test-runner/output/junit_classname_hierarchy.js‎
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
'use strict';
2+
require('../../../common');
3+
const{ suite, test }=require('node:test');
4+
5+
suite('Math',()=>{
6+
suite('Addition',()=>{
7+
test('adds positive numbers',()=>{});
8+
});
9+
10+
suite('Multiplication',()=>{
11+
test('multiplies positive numbers',()=>{});
12+
});
13+
});
14+
15+
suite('String',()=>{
16+
test('concatenates strings',()=>{});
17+
});
18+
19+
test('standalone test',()=>{});
‎test/fixtures/test-runner/output/junit_classname_hierarchy.snapshot‎
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<testsuites>
3+
	<testsuitename="Math"time="*"disabled="0"errors="0"tests="2"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
4+
 <testsuitename="Addition"time="*"disabled="0"errors="0"tests="1"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
5+
 <testcasename="adds positive numbers"time="*"classname="Math.Addition"file="*"/>
6+
 </testsuite>
7+
 <testsuitename="Multiplication"time="*"disabled="0"errors="0"tests="1"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
8+
 <testcasename="multiplies positive numbers"time="*"classname="Math.Multiplication"file="*"/>
9+
 </testsuite>
10+
	</testsuite>
11+
	<testsuitename="String"time="*"disabled="0"errors="0"tests="1"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
12+
 <testcasename="concatenates strings"time="*"classname="String"file="*"/>
13+
	</testsuite>
14+
	<testcasename="standalone test"time="*"classname="test"file="*"/>
15+
<!-- tests 4 -->
16+
<!-- suites 4 -->
17+
<!-- pass 4 -->
18+
<!-- fail 0 -->
19+
<!-- cancelled 0 -->
20+
<!-- skipped 0 -->
21+
<!-- todo 0 -->
22+
<!-- duration_ms * -->
23+
</testsuites>
‎test/fixtures/test-runner/output/junit_reporter.snapshot‎
Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ true !== false
129129
	<testcasename="immediate reject - passes but warns"time="*"classname="test"file="*"/>
130130
	<testcasename="immediate resolve pass"time="*"classname="test"file="*"/>
131131
	<testsuitename="subtest sync throw fail"time="*"disabled="0"errors="0"tests="1"failures="1"skipped="0"timestamp="*"hostname="HOSTNAME">
132-
 <testcasename="+sync throw fail"time="*"classname="test"file="*"failure="thrown from subtest sync throw fail">
132+
 <testcasename="+sync throw fail"time="*"classname="subtest sync throw fail"file="*"failure="thrown from subtest sync throw fail">
133133
 <failuretype="testCodeFailure"message="thrown from subtest sync throw fail">
134134
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fail
135135
 at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:125:11)
@@ -152,15 +152,15 @@ Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fail
152152
 </failure>
153153
	</testcase>
154154
	<testsuitename="level 0a"time="*"disabled="0"errors="0"tests="4"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
155-
 <testcasename="level 1a"time="*"classname="test"file="*"/>
156-
 <testcasename="level 1b"time="*"classname="test"file="*"/>
157-
 <testcasename="level 1c"time="*"classname="test"file="*"/>
158-
 <testcasename="level 1d"time="*"classname="test"file="*"/>
155+
 <testcasename="level 1a"time="*"classname="level 0a"file="*"/>
156+
 <testcasename="level 1b"time="*"classname="level 0a"file="*"/>
157+
 <testcasename="level 1c"time="*"classname="level 0a"file="*"/>
158+
 <testcasename="level 1d"time="*"classname="level 0a"file="*"/>
159159
	</testsuite>
160160
	<testsuitename="top level"time="*"disabled="0"errors="0"tests="2"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
161-
 <testcasename="+long running"time="*"classname="test"file="*"/>
161+
 <testcasename="+long running"time="*"classname="top level"file="*"/>
162162
 <testsuitename="+short running"time="*"disabled="0"errors="0"tests="1"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
163-
 <testcasename="++short running"time="*"classname="test"file="*"/>
163+
 <testcasename="++short running"time="*"classname="top level.+short running"file="*"/>
164164
 </testsuite>
165165
	</testsuite>
166166
	<testcasename="invalid subtest - pass but subtest fails"time="*"classname="test"file="*"/>
@@ -267,9 +267,9 @@ Error [ERR_TEST_FAILURE]: thrown from callback async throw
267267
	</testcase>
268268
	<testcasename="callback async throw after done"time="*"classname="test"file="*"/>
269269
	<testsuitename="only is set on subtests but not in only mode"time="*"disabled="0"errors="0"tests="3"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
270-
 <testcasename="running subtest 1"time="*"classname="test"file="*"/>
271-
 <testcasename="running subtest 3"time="*"classname="test"file="*"/>
272-
 <testcasename="running subtest 4"time="*"classname="test"file="*"/>
270+
 <testcasename="running subtest 1"time="*"classname="only is set on subtests but not in only mode"file="*"/>
271+
 <testcasename="running subtest 3"time="*"classname="only is set on subtests but not in only mode"file="*"/>
272+
 <testcasename="running subtest 4"time="*"classname="only is set on subtests but not in only mode"file="*"/>
273273
	</testsuite>
274274
	<testcasename="custom inspect symbol fail"time="*"classname="test"file="*"failure="customized">
275275
 <failuretype="testCodeFailure"message="customized">
@@ -289,7 +289,7 @@ Error [ERR_TEST_FAILURE]: thrown from callback async throw
289289
 </failure>
290290
	</testcase>
291291
	<testsuitename="subtest sync throw fails"time="*"disabled="0"errors="0"tests="2"failures="2"skipped="0"timestamp="*"hostname="HOSTNAME">
292-
 <testcasename="sync throw fails at first"time="*"classname="test"file="*"failure="thrown from subtest sync throw fails at first">
292+
 <testcasename="sync throw fails at first"time="*"classname="subtest sync throw fails"file="*"failure="thrown from subtest sync throw fails at first">
293293
 <failuretype="testCodeFailure"message="thrown from subtest sync throw fails at first">
294294
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at first
295295
 at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:334:11)
@@ -304,7 +304,7 @@ Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at first
304304
}
305305
 </failure>
306306
 </testcase>
307-
 <testcasename="sync throw fails at second"time="*"classname="test"file="*"failure="thrown from subtest sync throw fails at second">
307+
 <testcasename="sync throw fails at second"time="*"classname="subtest sync throw fails"file="*"failure="thrown from subtest sync throw fails at second">
308308
 <failuretype="testCodeFailure"message="thrown from subtest sync throw fails at second">
309309
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at second
310310
 at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:337:11) {
‎test/parallel/test-runner-reporters.js‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ describe('node:test reporters', { concurrency: true }, () => {
207207
assert.match(timestamp,/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/);
208208
assert.ok(!Number.isNaN(Date.parse(timestamp)),`expected a valid date, got ${timestamp}`);
209209
assert.match(fileContents,/<testcase.*name="failing".*>\s*<failure.*type="testCodeFailure".*message="error".*>/);
210-
assert.match(fileContents,/<testcase.*name="ok".*classname="test".*\/>/);
210+
assert.match(fileContents,/<testcase.*name="ok".*classname="nested".*\/>/);
211211
assert.match(fileContents,/<testcase.*name="toplevel".*classname="test".*\/>/);
212212
});
213213
});
‎test/test-runner/test-output-junit-classname-hierarchy.mjs‎
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
// Test that the output of test-runner/output/junit_classname_hierarchy.js matches
2+
// test-runner/output/junit_classname_hierarchy.snapshot
3+
import'../common/index.mjs';
4+
import*asfixturesfrom'../common/fixtures.mjs';
5+
import{spawnAndAssert,junitTransform,ensureCwdIsProjectRoot}from'../common/assertSnapshot.js';
6+
7+
ensureCwdIsProjectRoot();
8+
awaitspawnAndAssert(
9+
fixtures.path('test-runner/output/junit_classname_hierarchy.js'),
10+
junitTransform,
11+
{flags: ['--test-reporter=junit']},
12+
);
0 commit comments
Comments
 (0)

, '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
Commit 400d598
Browse files
mag123caduh95
mag123c
authored and
aduh95
committed
test_runner: add classname hierarchy for JUnit reporter
Signed-off-by: mag123c <diehreo@gmail.com>
PR-URL: #60220Fixes: #59417
Reviewed-By: Chemi Atlow <chemi@atlow.co.il>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Pietro Marchini <pietro.marchini94@gmail.com>
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Reviewed-By: Aviv Keller <me@aviv.sh>
1 parent 41edd2f commit 400d598
7 files changed
Lines changed: 81 additions & 13 deletions
File tree
‎lib/internal/test_runner/test.js‎
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
const{
33
 ArrayFrom,
44
 ArrayPrototypeEvery,
5+
 ArrayPrototypeJoin,
56
 ArrayPrototypePush,
67
 ArrayPrototypePushApply,
78
 ArrayPrototypeShift,
@@ -1672,6 +1673,17 @@ class Test extends AsyncResource {
16721673
details.passed_on_attempt=this.passedAttempt;
16731674
}
16741675

1676+
// Generate classname from suite hierarchy for JUnit reporter
1677+
if(this.parent&&this.parent!==this.root){
1678+
constparts=[];
1679+
for(lett=this.parent;t!==t.root;t=t.parent){
1680+
ArrayPrototypeUnshift(parts,t.name);
1681+
}
1682+
if(parts.length>0){
1683+
details.classname=ArrayPrototypeJoin(parts,'.');
1684+
}
1685+
}
1686+
16751687
return{__proto__: null, details, directive };
16761688
}
16771689

‎lib/internal/test_runner/tests_stream.js‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ class TestsStream extends Readable {
4545
 parentId,
4646
 details,
4747
tags: ArrayPrototypeSlice(tags),
48+
 ...(details.classname&&{__proto__: null,classname: details.classname}),
4849
 ...loc,
4950
 ...directive,
5051
});
@@ -60,6 +61,7 @@ class TestsStream extends Readable {
6061
 parentId,
6162
 details,
6263
tags: ArrayPrototypeSlice(tags),
64+
 ...(details.classname&&{__proto__: null,classname: details.classname}),
6365
 ...loc,
6466
 ...directive,
6567
});
‎test/fixtures/test-runner/output/junit_classname_hierarchy.js‎
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
'use strict';
2+
require('../../../common');
3+
const{ suite, test }=require('node:test');
4+
5+
suite('Math',()=>{
6+
suite('Addition',()=>{
7+
test('adds positive numbers',()=>{});
8+
});
9+
10+
suite('Multiplication',()=>{
11+
test('multiplies positive numbers',()=>{});
12+
});
13+
});
14+
15+
suite('String',()=>{
16+
test('concatenates strings',()=>{});
17+
});
18+
19+
test('standalone test',()=>{});
‎test/fixtures/test-runner/output/junit_classname_hierarchy.snapshot‎
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<testsuites>
3+
	<testsuitename="Math"time="*"disabled="0"errors="0"tests="2"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
4+
 <testsuitename="Addition"time="*"disabled="0"errors="0"tests="1"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
5+
 <testcasename="adds positive numbers"time="*"classname="Math.Addition"file="*"/>
6+
 </testsuite>
7+
 <testsuitename="Multiplication"time="*"disabled="0"errors="0"tests="1"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
8+
 <testcasename="multiplies positive numbers"time="*"classname="Math.Multiplication"file="*"/>
9+
 </testsuite>
10+
	</testsuite>
11+
	<testsuitename="String"time="*"disabled="0"errors="0"tests="1"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
12+
 <testcasename="concatenates strings"time="*"classname="String"file="*"/>
13+
	</testsuite>
14+
	<testcasename="standalone test"time="*"classname="test"file="*"/>
15+
<!-- tests 4 -->
16+
<!-- suites 4 -->
17+
<!-- pass 4 -->
18+
<!-- fail 0 -->
19+
<!-- cancelled 0 -->
20+
<!-- skipped 0 -->
21+
<!-- todo 0 -->
22+
<!-- duration_ms * -->
23+
</testsuites>
‎test/fixtures/test-runner/output/junit_reporter.snapshot‎
Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ true !== false
129129
	<testcasename="immediate reject - passes but warns"time="*"classname="test"file="*"/>
130130
	<testcasename="immediate resolve pass"time="*"classname="test"file="*"/>
131131
	<testsuitename="subtest sync throw fail"time="*"disabled="0"errors="0"tests="1"failures="1"skipped="0"timestamp="*"hostname="HOSTNAME">
132-
 <testcasename="+sync throw fail"time="*"classname="test"file="*"failure="thrown from subtest sync throw fail">
132+
 <testcasename="+sync throw fail"time="*"classname="subtest sync throw fail"file="*"failure="thrown from subtest sync throw fail">
133133
 <failuretype="testCodeFailure"message="thrown from subtest sync throw fail">
134134
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fail
135135
 at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:125:11)
@@ -152,15 +152,15 @@ Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fail
152152
 </failure>
153153
	</testcase>
154154
	<testsuitename="level 0a"time="*"disabled="0"errors="0"tests="4"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
155-
 <testcasename="level 1a"time="*"classname="test"file="*"/>
156-
 <testcasename="level 1b"time="*"classname="test"file="*"/>
157-
 <testcasename="level 1c"time="*"classname="test"file="*"/>
158-
 <testcasename="level 1d"time="*"classname="test"file="*"/>
155+
 <testcasename="level 1a"time="*"classname="level 0a"file="*"/>
156+
 <testcasename="level 1b"time="*"classname="level 0a"file="*"/>
157+
 <testcasename="level 1c"time="*"classname="level 0a"file="*"/>
158+
 <testcasename="level 1d"time="*"classname="level 0a"file="*"/>
159159
	</testsuite>
160160
	<testsuitename="top level"time="*"disabled="0"errors="0"tests="2"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
161-
 <testcasename="+long running"time="*"classname="test"file="*"/>
161+
 <testcasename="+long running"time="*"classname="top level"file="*"/>
162162
 <testsuitename="+short running"time="*"disabled="0"errors="0"tests="1"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
163-
 <testcasename="++short running"time="*"classname="test"file="*"/>
163+
 <testcasename="++short running"time="*"classname="top level.+short running"file="*"/>
164164
 </testsuite>
165165
	</testsuite>
166166
	<testcasename="invalid subtest - pass but subtest fails"time="*"classname="test"file="*"/>
@@ -267,9 +267,9 @@ Error [ERR_TEST_FAILURE]: thrown from callback async throw
267267
	</testcase>
268268
	<testcasename="callback async throw after done"time="*"classname="test"file="*"/>
269269
	<testsuitename="only is set on subtests but not in only mode"time="*"disabled="0"errors="0"tests="3"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
270-
 <testcasename="running subtest 1"time="*"classname="test"file="*"/>
271-
 <testcasename="running subtest 3"time="*"classname="test"file="*"/>
272-
 <testcasename="running subtest 4"time="*"classname="test"file="*"/>
270+
 <testcasename="running subtest 1"time="*"classname="only is set on subtests but not in only mode"file="*"/>
271+
 <testcasename="running subtest 3"time="*"classname="only is set on subtests but not in only mode"file="*"/>
272+
 <testcasename="running subtest 4"time="*"classname="only is set on subtests but not in only mode"file="*"/>
273273
	</testsuite>
274274
	<testcasename="custom inspect symbol fail"time="*"classname="test"file="*"failure="customized">
275275
 <failuretype="testCodeFailure"message="customized">
@@ -289,7 +289,7 @@ Error [ERR_TEST_FAILURE]: thrown from callback async throw
289289
 </failure>
290290
	</testcase>
291291
	<testsuitename="subtest sync throw fails"time="*"disabled="0"errors="0"tests="2"failures="2"skipped="0"timestamp="*"hostname="HOSTNAME">
292-
 <testcasename="sync throw fails at first"time="*"classname="test"file="*"failure="thrown from subtest sync throw fails at first">
292+
 <testcasename="sync throw fails at first"time="*"classname="subtest sync throw fails"file="*"failure="thrown from subtest sync throw fails at first">
293293
 <failuretype="testCodeFailure"message="thrown from subtest sync throw fails at first">
294294
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at first
295295
 at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:334:11)
@@ -304,7 +304,7 @@ Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at first
304304
}
305305
 </failure>
306306
 </testcase>
307-
 <testcasename="sync throw fails at second"time="*"classname="test"file="*"failure="thrown from subtest sync throw fails at second">
307+
 <testcasename="sync throw fails at second"time="*"classname="subtest sync throw fails"file="*"failure="thrown from subtest sync throw fails at second">
308308
 <failuretype="testCodeFailure"message="thrown from subtest sync throw fails at second">
309309
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at second
310310
 at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:337:11) {
‎test/parallel/test-runner-reporters.js‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ describe('node:test reporters', { concurrency: true }, () => {
207207
assert.match(timestamp,/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/);
208208
assert.ok(!Number.isNaN(Date.parse(timestamp)),`expected a valid date, got ${timestamp}`);
209209
assert.match(fileContents,/<testcase.*name="failing".*>\s*<failure.*type="testCodeFailure".*message="error".*>/);
210-
assert.match(fileContents,/<testcase.*name="ok".*classname="test".*\/>/);
210+
assert.match(fileContents,/<testcase.*name="ok".*classname="nested".*\/>/);
211211
assert.match(fileContents,/<testcase.*name="toplevel".*classname="test".*\/>/);
212212
});
213213
});
‎test/test-runner/test-output-junit-classname-hierarchy.mjs‎
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
// Test that the output of test-runner/output/junit_classname_hierarchy.js matches
2+
// test-runner/output/junit_classname_hierarchy.snapshot
3+
import'../common/index.mjs';
4+
import*asfixturesfrom'../common/fixtures.mjs';
5+
import{spawnAndAssert,junitTransform,ensureCwdIsProjectRoot}from'../common/assertSnapshot.js';
6+
7+
ensureCwdIsProjectRoot();
8+
awaitspawnAndAssert(
9+
fixtures.path('test-runner/output/junit_classname_hierarchy.js'),
10+
junitTransform,
11+
{flags: ['--test-reporter=junit']},
12+
);
0 commit comments
Comments
 (0)

, '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
Commit 400d598
Browse files
mag123caduh95
mag123c
authored and
aduh95
committed
test_runner: add classname hierarchy for JUnit reporter
Signed-off-by: mag123c <diehreo@gmail.com>
PR-URL: #60220Fixes: #59417
Reviewed-By: Chemi Atlow <chemi@atlow.co.il>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Pietro Marchini <pietro.marchini94@gmail.com>
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Reviewed-By: Aviv Keller <me@aviv.sh>
1 parent 41edd2f commit 400d598
7 files changed
Lines changed: 81 additions & 13 deletions
File tree
‎lib/internal/test_runner/test.js‎
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
const{
33
 ArrayFrom,
44
 ArrayPrototypeEvery,
5+
 ArrayPrototypeJoin,
56
 ArrayPrototypePush,
67
 ArrayPrototypePushApply,
78
 ArrayPrototypeShift,
@@ -1672,6 +1673,17 @@ class Test extends AsyncResource {
16721673
details.passed_on_attempt=this.passedAttempt;
16731674
}
16741675

1676+
// Generate classname from suite hierarchy for JUnit reporter
1677+
if(this.parent&&this.parent!==this.root){
1678+
constparts=[];
1679+
for(lett=this.parent;t!==t.root;t=t.parent){
1680+
ArrayPrototypeUnshift(parts,t.name);
1681+
}
1682+
if(parts.length>0){
1683+
details.classname=ArrayPrototypeJoin(parts,'.');
1684+
}
1685+
}
1686+
16751687
return{__proto__: null, details, directive };
16761688
}
16771689

‎lib/internal/test_runner/tests_stream.js‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ class TestsStream extends Readable {
4545
 parentId,
4646
 details,
4747
tags: ArrayPrototypeSlice(tags),
48+
 ...(details.classname&&{__proto__: null,classname: details.classname}),
4849
 ...loc,
4950
 ...directive,
5051
});
@@ -60,6 +61,7 @@ class TestsStream extends Readable {
6061
 parentId,
6162
 details,
6263
tags: ArrayPrototypeSlice(tags),
64+
 ...(details.classname&&{__proto__: null,classname: details.classname}),
6365
 ...loc,
6466
 ...directive,
6567
});
‎test/fixtures/test-runner/output/junit_classname_hierarchy.js‎
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
'use strict';
2+
require('../../../common');
3+
const{ suite, test }=require('node:test');
4+
5+
suite('Math',()=>{
6+
suite('Addition',()=>{
7+
test('adds positive numbers',()=>{});
8+
});
9+
10+
suite('Multiplication',()=>{
11+
test('multiplies positive numbers',()=>{});
12+
});
13+
});
14+
15+
suite('String',()=>{
16+
test('concatenates strings',()=>{});
17+
});
18+
19+
test('standalone test',()=>{});
‎test/fixtures/test-runner/output/junit_classname_hierarchy.snapshot‎
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<testsuites>
3+
	<testsuitename="Math"time="*"disabled="0"errors="0"tests="2"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
4+
 <testsuitename="Addition"time="*"disabled="0"errors="0"tests="1"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
5+
 <testcasename="adds positive numbers"time="*"classname="Math.Addition"file="*"/>
6+
 </testsuite>
7+
 <testsuitename="Multiplication"time="*"disabled="0"errors="0"tests="1"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
8+
 <testcasename="multiplies positive numbers"time="*"classname="Math.Multiplication"file="*"/>
9+
 </testsuite>
10+
	</testsuite>
11+
	<testsuitename="String"time="*"disabled="0"errors="0"tests="1"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
12+
 <testcasename="concatenates strings"time="*"classname="String"file="*"/>
13+
	</testsuite>
14+
	<testcasename="standalone test"time="*"classname="test"file="*"/>
15+
<!-- tests 4 -->
16+
<!-- suites 4 -->
17+
<!-- pass 4 -->
18+
<!-- fail 0 -->
19+
<!-- cancelled 0 -->
20+
<!-- skipped 0 -->
21+
<!-- todo 0 -->
22+
<!-- duration_ms * -->
23+
</testsuites>
‎test/fixtures/test-runner/output/junit_reporter.snapshot‎
Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ true !== false
129129
	<testcasename="immediate reject - passes but warns"time="*"classname="test"file="*"/>
130130
	<testcasename="immediate resolve pass"time="*"classname="test"file="*"/>
131131
	<testsuitename="subtest sync throw fail"time="*"disabled="0"errors="0"tests="1"failures="1"skipped="0"timestamp="*"hostname="HOSTNAME">
132-
 <testcasename="+sync throw fail"time="*"classname="test"file="*"failure="thrown from subtest sync throw fail">
132+
 <testcasename="+sync throw fail"time="*"classname="subtest sync throw fail"file="*"failure="thrown from subtest sync throw fail">
133133
 <failuretype="testCodeFailure"message="thrown from subtest sync throw fail">
134134
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fail
135135
 at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:125:11)
@@ -152,15 +152,15 @@ Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fail
152152
 </failure>
153153
	</testcase>
154154
	<testsuitename="level 0a"time="*"disabled="0"errors="0"tests="4"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
155-
 <testcasename="level 1a"time="*"classname="test"file="*"/>
156-
 <testcasename="level 1b"time="*"classname="test"file="*"/>
157-
 <testcasename="level 1c"time="*"classname="test"file="*"/>
158-
 <testcasename="level 1d"time="*"classname="test"file="*"/>
155+
 <testcasename="level 1a"time="*"classname="level 0a"file="*"/>
156+
 <testcasename="level 1b"time="*"classname="level 0a"file="*"/>
157+
 <testcasename="level 1c"time="*"classname="level 0a"file="*"/>
158+
 <testcasename="level 1d"time="*"classname="level 0a"file="*"/>
159159
	</testsuite>
160160
	<testsuitename="top level"time="*"disabled="0"errors="0"tests="2"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
161-
 <testcasename="+long running"time="*"classname="test"file="*"/>
161+
 <testcasename="+long running"time="*"classname="top level"file="*"/>
162162
 <testsuitename="+short running"time="*"disabled="0"errors="0"tests="1"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
163-
 <testcasename="++short running"time="*"classname="test"file="*"/>
163+
 <testcasename="++short running"time="*"classname="top level.+short running"file="*"/>
164164
 </testsuite>
165165
	</testsuite>
166166
	<testcasename="invalid subtest - pass but subtest fails"time="*"classname="test"file="*"/>
@@ -267,9 +267,9 @@ Error [ERR_TEST_FAILURE]: thrown from callback async throw
267267
	</testcase>
268268
	<testcasename="callback async throw after done"time="*"classname="test"file="*"/>
269269
	<testsuitename="only is set on subtests but not in only mode"time="*"disabled="0"errors="0"tests="3"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
270-
 <testcasename="running subtest 1"time="*"classname="test"file="*"/>
271-
 <testcasename="running subtest 3"time="*"classname="test"file="*"/>
272-
 <testcasename="running subtest 4"time="*"classname="test"file="*"/>
270+
 <testcasename="running subtest 1"time="*"classname="only is set on subtests but not in only mode"file="*"/>
271+
 <testcasename="running subtest 3"time="*"classname="only is set on subtests but not in only mode"file="*"/>
272+
 <testcasename="running subtest 4"time="*"classname="only is set on subtests but not in only mode"file="*"/>
273273
	</testsuite>
274274
	<testcasename="custom inspect symbol fail"time="*"classname="test"file="*"failure="customized">
275275
 <failuretype="testCodeFailure"message="customized">
@@ -289,7 +289,7 @@ Error [ERR_TEST_FAILURE]: thrown from callback async throw
289289
 </failure>
290290
	</testcase>
291291
	<testsuitename="subtest sync throw fails"time="*"disabled="0"errors="0"tests="2"failures="2"skipped="0"timestamp="*"hostname="HOSTNAME">
292-
 <testcasename="sync throw fails at first"time="*"classname="test"file="*"failure="thrown from subtest sync throw fails at first">
292+
 <testcasename="sync throw fails at first"time="*"classname="subtest sync throw fails"file="*"failure="thrown from subtest sync throw fails at first">
293293
 <failuretype="testCodeFailure"message="thrown from subtest sync throw fails at first">
294294
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at first
295295
 at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:334:11)
@@ -304,7 +304,7 @@ Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at first
304304
}
305305
 </failure>
306306
 </testcase>
307-
 <testcasename="sync throw fails at second"time="*"classname="test"file="*"failure="thrown from subtest sync throw fails at second">
307+
 <testcasename="sync throw fails at second"time="*"classname="subtest sync throw fails"file="*"failure="thrown from subtest sync throw fails at second">
308308
 <failuretype="testCodeFailure"message="thrown from subtest sync throw fails at second">
309309
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at second
310310
 at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:337:11) {
‎test/parallel/test-runner-reporters.js‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ describe('node:test reporters', { concurrency: true }, () => {
207207
assert.match(timestamp,/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/);
208208
assert.ok(!Number.isNaN(Date.parse(timestamp)),`expected a valid date, got ${timestamp}`);
209209
assert.match(fileContents,/<testcase.*name="failing".*>\s*<failure.*type="testCodeFailure".*message="error".*>/);
210-
assert.match(fileContents,/<testcase.*name="ok".*classname="test".*\/>/);
210+
assert.match(fileContents,/<testcase.*name="ok".*classname="nested".*\/>/);
211211
assert.match(fileContents,/<testcase.*name="toplevel".*classname="test".*\/>/);
212212
});
213213
});
‎test/test-runner/test-output-junit-classname-hierarchy.mjs‎
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
// Test that the output of test-runner/output/junit_classname_hierarchy.js matches
2+
// test-runner/output/junit_classname_hierarchy.snapshot
3+
import'../common/index.mjs';
4+
import*asfixturesfrom'../common/fixtures.mjs';
5+
import{spawnAndAssert,junitTransform,ensureCwdIsProjectRoot}from'../common/assertSnapshot.js';
6+
7+
ensureCwdIsProjectRoot();
8+
awaitspawnAndAssert(
9+
fixtures.path('test-runner/output/junit_classname_hierarchy.js'),
10+
junitTransform,
11+
{flags: ['--test-reporter=junit']},
12+
);
0 commit comments
Comments
 (0)

, '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
Commit 400d598
Browse files
mag123caduh95
mag123c
authored and
aduh95
committed
test_runner: add classname hierarchy for JUnit reporter
Signed-off-by: mag123c <diehreo@gmail.com>
PR-URL: #60220Fixes: #59417
Reviewed-By: Chemi Atlow <chemi@atlow.co.il>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Pietro Marchini <pietro.marchini94@gmail.com>
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Reviewed-By: Aviv Keller <me@aviv.sh>
1 parent 41edd2f commit 400d598
7 files changed
Lines changed: 81 additions & 13 deletions
File tree
‎lib/internal/test_runner/test.js‎
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
const{
33
 ArrayFrom,
44
 ArrayPrototypeEvery,
5+
 ArrayPrototypeJoin,
56
 ArrayPrototypePush,
67
 ArrayPrototypePushApply,
78
 ArrayPrototypeShift,
@@ -1672,6 +1673,17 @@ class Test extends AsyncResource {
16721673
details.passed_on_attempt=this.passedAttempt;
16731674
}
16741675

1676+
// Generate classname from suite hierarchy for JUnit reporter
1677+
if(this.parent&&this.parent!==this.root){
1678+
constparts=[];
1679+
for(lett=this.parent;t!==t.root;t=t.parent){
1680+
ArrayPrototypeUnshift(parts,t.name);
1681+
}
1682+
if(parts.length>0){
1683+
details.classname=ArrayPrototypeJoin(parts,'.');
1684+
}
1685+
}
1686+
16751687
return{__proto__: null, details, directive };
16761688
}
16771689

‎lib/internal/test_runner/tests_stream.js‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ class TestsStream extends Readable {
4545
 parentId,
4646
 details,
4747
tags: ArrayPrototypeSlice(tags),
48+
 ...(details.classname&&{__proto__: null,classname: details.classname}),
4849
 ...loc,
4950
 ...directive,
5051
});
@@ -60,6 +61,7 @@ class TestsStream extends Readable {
6061
 parentId,
6162
 details,
6263
tags: ArrayPrototypeSlice(tags),
64+
 ...(details.classname&&{__proto__: null,classname: details.classname}),
6365
 ...loc,
6466
 ...directive,
6567
});
‎test/fixtures/test-runner/output/junit_classname_hierarchy.js‎
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
'use strict';
2+
require('../../../common');
3+
const{ suite, test }=require('node:test');
4+
5+
suite('Math',()=>{
6+
suite('Addition',()=>{
7+
test('adds positive numbers',()=>{});
8+
});
9+
10+
suite('Multiplication',()=>{
11+
test('multiplies positive numbers',()=>{});
12+
});
13+
});
14+
15+
suite('String',()=>{
16+
test('concatenates strings',()=>{});
17+
});
18+
19+
test('standalone test',()=>{});
‎test/fixtures/test-runner/output/junit_classname_hierarchy.snapshot‎
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<testsuites>
3+
	<testsuitename="Math"time="*"disabled="0"errors="0"tests="2"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
4+
 <testsuitename="Addition"time="*"disabled="0"errors="0"tests="1"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
5+
 <testcasename="adds positive numbers"time="*"classname="Math.Addition"file="*"/>
6+
 </testsuite>
7+
 <testsuitename="Multiplication"time="*"disabled="0"errors="0"tests="1"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
8+
 <testcasename="multiplies positive numbers"time="*"classname="Math.Multiplication"file="*"/>
9+
 </testsuite>
10+
	</testsuite>
11+
	<testsuitename="String"time="*"disabled="0"errors="0"tests="1"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
12+
 <testcasename="concatenates strings"time="*"classname="String"file="*"/>
13+
	</testsuite>
14+
	<testcasename="standalone test"time="*"classname="test"file="*"/>
15+
<!-- tests 4 -->
16+
<!-- suites 4 -->
17+
<!-- pass 4 -->
18+
<!-- fail 0 -->
19+
<!-- cancelled 0 -->
20+
<!-- skipped 0 -->
21+
<!-- todo 0 -->
22+
<!-- duration_ms * -->
23+
</testsuites>
‎test/fixtures/test-runner/output/junit_reporter.snapshot‎
Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ true !== false
129129
	<testcasename="immediate reject - passes but warns"time="*"classname="test"file="*"/>
130130
	<testcasename="immediate resolve pass"time="*"classname="test"file="*"/>
131131
	<testsuitename="subtest sync throw fail"time="*"disabled="0"errors="0"tests="1"failures="1"skipped="0"timestamp="*"hostname="HOSTNAME">
132-
 <testcasename="+sync throw fail"time="*"classname="test"file="*"failure="thrown from subtest sync throw fail">
132+
 <testcasename="+sync throw fail"time="*"classname="subtest sync throw fail"file="*"failure="thrown from subtest sync throw fail">
133133
 <failuretype="testCodeFailure"message="thrown from subtest sync throw fail">
134134
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fail
135135
 at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:125:11)
@@ -152,15 +152,15 @@ Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fail
152152
 </failure>
153153
	</testcase>
154154
	<testsuitename="level 0a"time="*"disabled="0"errors="0"tests="4"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
155-
 <testcasename="level 1a"time="*"classname="test"file="*"/>
156-
 <testcasename="level 1b"time="*"classname="test"file="*"/>
157-
 <testcasename="level 1c"time="*"classname="test"file="*"/>
158-
 <testcasename="level 1d"time="*"classname="test"file="*"/>
155+
 <testcasename="level 1a"time="*"classname="level 0a"file="*"/>
156+
 <testcasename="level 1b"time="*"classname="level 0a"file="*"/>
157+
 <testcasename="level 1c"time="*"classname="level 0a"file="*"/>
158+
 <testcasename="level 1d"time="*"classname="level 0a"file="*"/>
159159
	</testsuite>
160160
	<testsuitename="top level"time="*"disabled="0"errors="0"tests="2"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
161-
 <testcasename="+long running"time="*"classname="test"file="*"/>
161+
 <testcasename="+long running"time="*"classname="top level"file="*"/>
162162
 <testsuitename="+short running"time="*"disabled="0"errors="0"tests="1"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
163-
 <testcasename="++short running"time="*"classname="test"file="*"/>
163+
 <testcasename="++short running"time="*"classname="top level.+short running"file="*"/>
164164
 </testsuite>
165165
	</testsuite>
166166
	<testcasename="invalid subtest - pass but subtest fails"time="*"classname="test"file="*"/>
@@ -267,9 +267,9 @@ Error [ERR_TEST_FAILURE]: thrown from callback async throw
267267
	</testcase>
268268
	<testcasename="callback async throw after done"time="*"classname="test"file="*"/>
269269
	<testsuitename="only is set on subtests but not in only mode"time="*"disabled="0"errors="0"tests="3"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
270-
 <testcasename="running subtest 1"time="*"classname="test"file="*"/>
271-
 <testcasename="running subtest 3"time="*"classname="test"file="*"/>
272-
 <testcasename="running subtest 4"time="*"classname="test"file="*"/>
270+
 <testcasename="running subtest 1"time="*"classname="only is set on subtests but not in only mode"file="*"/>
271+
 <testcasename="running subtest 3"time="*"classname="only is set on subtests but not in only mode"file="*"/>
272+
 <testcasename="running subtest 4"time="*"classname="only is set on subtests but not in only mode"file="*"/>
273273
	</testsuite>
274274
	<testcasename="custom inspect symbol fail"time="*"classname="test"file="*"failure="customized">
275275
 <failuretype="testCodeFailure"message="customized">
@@ -289,7 +289,7 @@ Error [ERR_TEST_FAILURE]: thrown from callback async throw
289289
 </failure>
290290
	</testcase>
291291
	<testsuitename="subtest sync throw fails"time="*"disabled="0"errors="0"tests="2"failures="2"skipped="0"timestamp="*"hostname="HOSTNAME">
292-
 <testcasename="sync throw fails at first"time="*"classname="test"file="*"failure="thrown from subtest sync throw fails at first">
292+
 <testcasename="sync throw fails at first"time="*"classname="subtest sync throw fails"file="*"failure="thrown from subtest sync throw fails at first">
293293
 <failuretype="testCodeFailure"message="thrown from subtest sync throw fails at first">
294294
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at first
295295
 at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:334:11)
@@ -304,7 +304,7 @@ Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at first
304304
}
305305
 </failure>
306306
 </testcase>
307-
 <testcasename="sync throw fails at second"time="*"classname="test"file="*"failure="thrown from subtest sync throw fails at second">
307+
 <testcasename="sync throw fails at second"time="*"classname="subtest sync throw fails"file="*"failure="thrown from subtest sync throw fails at second">
308308
 <failuretype="testCodeFailure"message="thrown from subtest sync throw fails at second">
309309
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at second
310310
 at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:337:11) {
‎test/parallel/test-runner-reporters.js‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ describe('node:test reporters', { concurrency: true }, () => {
207207
assert.match(timestamp,/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/);
208208
assert.ok(!Number.isNaN(Date.parse(timestamp)),`expected a valid date, got ${timestamp}`);
209209
assert.match(fileContents,/<testcase.*name="failing".*>\s*<failure.*type="testCodeFailure".*message="error".*>/);
210-
assert.match(fileContents,/<testcase.*name="ok".*classname="test".*\/>/);
210+
assert.match(fileContents,/<testcase.*name="ok".*classname="nested".*\/>/);
211211
assert.match(fileContents,/<testcase.*name="toplevel".*classname="test".*\/>/);
212212
});
213213
});
‎test/test-runner/test-output-junit-classname-hierarchy.mjs‎
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
// Test that the output of test-runner/output/junit_classname_hierarchy.js matches
2+
// test-runner/output/junit_classname_hierarchy.snapshot
3+
import'../common/index.mjs';
4+
import*asfixturesfrom'../common/fixtures.mjs';
5+
import{spawnAndAssert,junitTransform,ensureCwdIsProjectRoot}from'../common/assertSnapshot.js';
6+
7+
ensureCwdIsProjectRoot();
8+
awaitspawnAndAssert(
9+
fixtures.path('test-runner/output/junit_classname_hierarchy.js'),
10+
junitTransform,
11+
{flags: ['--test-reporter=junit']},
12+
);
0 commit comments
Comments
 (0)

, '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
Commit 400d598
Browse files
mag123caduh95
mag123c
authored and
aduh95
committed
test_runner: add classname hierarchy for JUnit reporter
Signed-off-by: mag123c <diehreo@gmail.com>
PR-URL: #60220Fixes: #59417
Reviewed-By: Chemi Atlow <chemi@atlow.co.il>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Pietro Marchini <pietro.marchini94@gmail.com>
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Reviewed-By: Aviv Keller <me@aviv.sh>
1 parent 41edd2f commit 400d598
7 files changed
Lines changed: 81 additions & 13 deletions
File tree
‎lib/internal/test_runner/test.js‎
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
const{
33
 ArrayFrom,
44
 ArrayPrototypeEvery,
5+
 ArrayPrototypeJoin,
56
 ArrayPrototypePush,
67
 ArrayPrototypePushApply,
78
 ArrayPrototypeShift,
@@ -1672,6 +1673,17 @@ class Test extends AsyncResource {
16721673
details.passed_on_attempt=this.passedAttempt;
16731674
}
16741675

1676+
// Generate classname from suite hierarchy for JUnit reporter
1677+
if(this.parent&&this.parent!==this.root){
1678+
constparts=[];
1679+
for(lett=this.parent;t!==t.root;t=t.parent){
1680+
ArrayPrototypeUnshift(parts,t.name);
1681+
}
1682+
if(parts.length>0){
1683+
details.classname=ArrayPrototypeJoin(parts,'.');
1684+
}
1685+
}
1686+
16751687
return{__proto__: null, details, directive };
16761688
}
16771689

‎lib/internal/test_runner/tests_stream.js‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ class TestsStream extends Readable {
4545
 parentId,
4646
 details,
4747
tags: ArrayPrototypeSlice(tags),
48+
 ...(details.classname&&{__proto__: null,classname: details.classname}),
4849
 ...loc,
4950
 ...directive,
5051
});
@@ -60,6 +61,7 @@ class TestsStream extends Readable {
6061
 parentId,
6162
 details,
6263
tags: ArrayPrototypeSlice(tags),
64+
 ...(details.classname&&{__proto__: null,classname: details.classname}),
6365
 ...loc,
6466
 ...directive,
6567
});
‎test/fixtures/test-runner/output/junit_classname_hierarchy.js‎
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
'use strict';
2+
require('../../../common');
3+
const{ suite, test }=require('node:test');
4+
5+
suite('Math',()=>{
6+
suite('Addition',()=>{
7+
test('adds positive numbers',()=>{});
8+
});
9+
10+
suite('Multiplication',()=>{
11+
test('multiplies positive numbers',()=>{});
12+
});
13+
});
14+
15+
suite('String',()=>{
16+
test('concatenates strings',()=>{});
17+
});
18+
19+
test('standalone test',()=>{});
‎test/fixtures/test-runner/output/junit_classname_hierarchy.snapshot‎
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<testsuites>
3+
	<testsuitename="Math"time="*"disabled="0"errors="0"tests="2"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
4+
 <testsuitename="Addition"time="*"disabled="0"errors="0"tests="1"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
5+
 <testcasename="adds positive numbers"time="*"classname="Math.Addition"file="*"/>
6+
 </testsuite>
7+
 <testsuitename="Multiplication"time="*"disabled="0"errors="0"tests="1"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
8+
 <testcasename="multiplies positive numbers"time="*"classname="Math.Multiplication"file="*"/>
9+
 </testsuite>
10+
	</testsuite>
11+
	<testsuitename="String"time="*"disabled="0"errors="0"tests="1"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
12+
 <testcasename="concatenates strings"time="*"classname="String"file="*"/>
13+
	</testsuite>
14+
	<testcasename="standalone test"time="*"classname="test"file="*"/>
15+
<!-- tests 4 -->
16+
<!-- suites 4 -->
17+
<!-- pass 4 -->
18+
<!-- fail 0 -->
19+
<!-- cancelled 0 -->
20+
<!-- skipped 0 -->
21+
<!-- todo 0 -->
22+
<!-- duration_ms * -->
23+
</testsuites>
‎test/fixtures/test-runner/output/junit_reporter.snapshot‎
Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ true !== false
129129
	<testcasename="immediate reject - passes but warns"time="*"classname="test"file="*"/>
130130
	<testcasename="immediate resolve pass"time="*"classname="test"file="*"/>
131131
	<testsuitename="subtest sync throw fail"time="*"disabled="0"errors="0"tests="1"failures="1"skipped="0"timestamp="*"hostname="HOSTNAME">
132-
 <testcasename="+sync throw fail"time="*"classname="test"file="*"failure="thrown from subtest sync throw fail">
132+
 <testcasename="+sync throw fail"time="*"classname="subtest sync throw fail"file="*"failure="thrown from subtest sync throw fail">
133133
 <failuretype="testCodeFailure"message="thrown from subtest sync throw fail">
134134
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fail
135135
 at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:125:11)
@@ -152,15 +152,15 @@ Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fail
152152
 </failure>
153153
	</testcase>
154154
	<testsuitename="level 0a"time="*"disabled="0"errors="0"tests="4"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
155-
 <testcasename="level 1a"time="*"classname="test"file="*"/>
156-
 <testcasename="level 1b"time="*"classname="test"file="*"/>
157-
 <testcasename="level 1c"time="*"classname="test"file="*"/>
158-
 <testcasename="level 1d"time="*"classname="test"file="*"/>
155+
 <testcasename="level 1a"time="*"classname="level 0a"file="*"/>
156+
 <testcasename="level 1b"time="*"classname="level 0a"file="*"/>
157+
 <testcasename="level 1c"time="*"classname="level 0a"file="*"/>
158+
 <testcasename="level 1d"time="*"classname="level 0a"file="*"/>
159159
	</testsuite>
160160
	<testsuitename="top level"time="*"disabled="0"errors="0"tests="2"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
161-
 <testcasename="+long running"time="*"classname="test"file="*"/>
161+
 <testcasename="+long running"time="*"classname="top level"file="*"/>
162162
 <testsuitename="+short running"time="*"disabled="0"errors="0"tests="1"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
163-
 <testcasename="++short running"time="*"classname="test"file="*"/>
163+
 <testcasename="++short running"time="*"classname="top level.+short running"file="*"/>
164164
 </testsuite>
165165
	</testsuite>
166166
	<testcasename="invalid subtest - pass but subtest fails"time="*"classname="test"file="*"/>
@@ -267,9 +267,9 @@ Error [ERR_TEST_FAILURE]: thrown from callback async throw
267267
	</testcase>
268268
	<testcasename="callback async throw after done"time="*"classname="test"file="*"/>
269269
	<testsuitename="only is set on subtests but not in only mode"time="*"disabled="0"errors="0"tests="3"failures="0"skipped="0"timestamp="*"hostname="HOSTNAME">
270-
 <testcasename="running subtest 1"time="*"classname="test"file="*"/>
271-
 <testcasename="running subtest 3"time="*"classname="test"file="*"/>
272-
 <testcasename="running subtest 4"time="*"classname="test"file="*"/>
270+
 <testcasename="running subtest 1"time="*"classname="only is set on subtests but not in only mode"file="*"/>
271+
 <testcasename="running subtest 3"time="*"classname="only is set on subtests but not in only mode"file="*"/>
272+
 <testcasename="running subtest 4"time="*"classname="only is set on subtests but not in only mode"file="*"/>
273273
	</testsuite>
274274
	<testcasename="custom inspect symbol fail"time="*"classname="test"file="*"failure="customized">
275275
 <failuretype="testCodeFailure"message="customized">
@@ -289,7 +289,7 @@ Error [ERR_TEST_FAILURE]: thrown from callback async throw
289289
 </failure>
290290
	</testcase>
291291
	<testsuitename="subtest sync throw fails"time="*"disabled="0"errors="0"tests="2"failures="2"skipped="0"timestamp="*"hostname="HOSTNAME">
292-
 <testcasename="sync throw fails at first"time="*"classname="test"file="*"failure="thrown from subtest sync throw fails at first">
292+
 <testcasename="sync throw fails at first"time="*"classname="subtest sync throw fails"file="*"failure="thrown from subtest sync throw fails at first">
293293
 <failuretype="testCodeFailure"message="thrown from subtest sync throw fails at first">
294294
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at first
295295
 at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:334:11)
@@ -304,7 +304,7 @@ Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at first
304304
}
305305
 </failure>
306306
 </testcase>
307-
 <testcasename="sync throw fails at second"time="*"classname="test"file="*"failure="thrown from subtest sync throw fails at second">
307+
 <testcasename="sync throw fails at second"time="*"classname="subtest sync throw fails"file="*"failure="thrown from subtest sync throw fails at second">
308308
 <failuretype="testCodeFailure"message="thrown from subtest sync throw fails at second">
309309
Error [ERR_TEST_FAILURE]: thrown from subtest sync throw fails at second
310310
 at TestContext.&lt;anonymous> (<project-root>/test/fixtures/test-runner/output/output.js:337:11) {
‎test/parallel/test-runner-reporters.js‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ describe('node:test reporters', { concurrency: true }, () => {
207207
assert.match(timestamp,/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/);
208208
assert.ok(!Number.isNaN(Date.parse(timestamp)),`expected a valid date, got ${timestamp}`);
209209
assert.match(fileContents,/<testcase.*name="failing".*>\s*<failure.*type="testCodeFailure".*message="error".*>/);
210-
assert.match(fileContents,/<testcase.*name="ok".*classname="test".*\/>/);
210+
assert.match(fileContents,/<testcase.*name="ok".*classname="nested".*\/>/);
211211
assert.match(fileContents,/<testcase.*name="toplevel".*classname="test".*\/>/);
212212
});
213213
});
‎test/test-runner/test-output-junit-classname-hierarchy.mjs‎
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
// Test that the output of test-runner/output/junit_classname_hierarchy.js matches
2+
// test-runner/output/junit_classname_hierarchy.snapshot
3+
import'../common/index.mjs';
4+
import*asfixturesfrom'../common/fixtures.mjs';
5+
import{spawnAndAssert,junitTransform,ensureCwdIsProjectRoot}from'../common/assertSnapshot.js';
6+
7+
ensureCwdIsProjectRoot();
8+
awaitspawnAndAssert(
9+
fixtures.path('test-runner/output/junit_classname_hierarchy.js'),
10+
junitTransform,
11+
{flags: ['--test-reporter=junit']},
12+
);
0 commit comments
Comments
 (0)