From 60c98089ccec50575c8b5cf164492a6932ff26ed Mon Sep 17 00:00:00 2001
From: Aleksandr Zabolotnikov
 <42497203+AlexCannonball@users.noreply.github.com>
Date: Wed, 15 Oct 2025 22:26:37 +0300
Subject: [PATCH] test_runner: fix line feed escaping in JUnit

Replaces line feed characters with the correct character reference in
XML attribute values.
---
 lib/internal/test_runner/reporter/junit.js           |  6 +++---
 .../test-runner/output/junit_reporter.snapshot       | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/internal/test_runner/reporter/junit.js b/lib/internal/test_runner/reporter/junit.js
index d9f9126ba28f85..25f5667c59e273 100644
--- a/lib/internal/test_runner/reporter/junit.js
+++ b/lib/internal/test_runner/reporter/junit.js
@@ -19,11 +19,11 @@ const inspectOptions = { __proto__: null, colors: false, breakLength: Infinity }
 const HOSTNAME = hostname();
 
 function escapeAttribute(s = '') {
-  return escapeContent(RegExpPrototypeSymbolReplace(/"/g, RegExpPrototypeSymbolReplace(/\n/g, s, ''), '&quot;'));
+  return escapeContent(RegExpPrototypeSymbolReplace(/"/g, RegExpPrototypeSymbolReplace(/\n/g, s, '&#10;'), '&quot;'));
 }
 
 function escapeContent(s = '') {
-  return RegExpPrototypeSymbolReplace(/</g, RegExpPrototypeSymbolReplace(/&/g, s, '&amp;'), '&lt;');
+  return RegExpPrototypeSymbolReplace(/</g, RegExpPrototypeSymbolReplace(/(&)(?!#\d{1,7};)/g, s, '&amp;'), '&lt;');
 }
 
 function escapeComment(s = '') {
@@ -137,7 +137,7 @@ module.exports = async function* junitReporter(source) {
               __proto__: null,
               nesting: event.data.nesting + 1,
               tag: 'failure',
-              attrs: { __proto__: null, type: error?.failureType || error?.code, message: error?.message ?? '' },
+              attrs: { __proto__: null, type: error?.failureType || error?.code, message: error?.message.trim() ?? '' },
               children: [inspectWithNoCustomRetry(error, inspectOptions)],
             });
             currentTest.failures = 1;
diff --git a/test/fixtures/test-runner/output/junit_reporter.snapshot b/test/fixtures/test-runner/output/junit_reporter.snapshot
index e955f9666049ca..78711141fa217b 100644
--- a/test/fixtures/test-runner/output/junit_reporter.snapshot
+++ b/test/fixtures/test-runner/output/junit_reporter.snapshot
@@ -101,8 +101,8 @@
 }
 		</failure>
 	</testcase>
-	<testcase name="async assertion fail" time="*" classname="test" file="*" failure="Expected values to be strictly equal:true !== false">
-		<failure type="testCodeFailure" message="Expected values to be strictly equal:true !== false">
+	<testcase name="async assertion fail" time="*" classname="test" file="*" failure="Expected values to be strictly equal:&#10;&#10;true !== false&#10;">
+		<failure type="testCodeFailure" message="Expected values to be strictly equal:&#10;&#10;true !== false">
 [Error [ERR_TEST_FAILURE]: Expected values to be strictly equal:
 
 true !== false
@@ -316,8 +316,8 @@ Error [ERR_TEST_FAILURE]: thrown from callback async throw
 [Error [ERR_TEST_FAILURE]: customized] { code: 'ERR_TEST_FAILURE', failureType: 'testCodeFailure', cause: customized }
 		</failure>
 	</testcase>
-	<testcase name="custom inspect symbol that throws fail" time="*" classname="test" file="*" failure="{  foo: 1,  Symbol(nodejs.util.inspect.custom): [Function: [nodejs.util.inspect.custom]]}">
-		<failure type="testCodeFailure" message="{  foo: 1,  Symbol(nodejs.util.inspect.custom): [Function: [nodejs.util.inspect.custom]]}">
+	<testcase name="custom inspect symbol that throws fail" time="*" classname="test" file="*" failure="{&#10;  foo: 1,&#10;  Symbol(nodejs.util.inspect.custom): [Function: [nodejs.util.inspect.custom]]&#10;}">
+		<failure type="testCodeFailure" message="{&#10;  foo: 1,&#10;  Symbol(nodejs.util.inspect.custom): [Function: [nodejs.util.inspect.custom]]&#10;}">
 [Error [ERR_TEST_FAILURE]: {
   foo: 1,
   Symbol(nodejs.util.inspect.custom): [Function: [nodejs.util.inspect.custom]]
@@ -413,8 +413,8 @@ Error [ERR_TEST_FAILURE]: bar
 }
 		</failure>
 	</testcase>
-	<testcase name="assertion errors display actual and expected properly" time="*" classname="test" file="*" failure="Expected values to be loosely deep-equal:{  bar: 1,  baz: {    date: 1970-01-01T00:00:00.000Z,    null: null,    number: 1,    string: 'Hello',    undefined: undefined  },  boo: [    1  ],  foo: 1}should loosely deep-equal{  baz: {    date: 1970-01-01T00:00:00.000Z,    null: null,    number: 1,    string: 'Hello',    undefined: undefined  },  boo: [    1  ],  circular: &lt;ref *1> {    bar: 2,    c: [Circular *1]  }}">
-		<failure type="testCodeFailure" message="Expected values to be loosely deep-equal:{  bar: 1,  baz: {    date: 1970-01-01T00:00:00.000Z,    null: null,    number: 1,    string: 'Hello',    undefined: undefined  },  boo: [    1  ],  foo: 1}should loosely deep-equal{  baz: {    date: 1970-01-01T00:00:00.000Z,    null: null,    number: 1,    string: 'Hello',    undefined: undefined  },  boo: [    1  ],  circular: &lt;ref *1> {    bar: 2,    c: [Circular *1]  }}">
+	<testcase name="assertion errors display actual and expected properly" time="*" classname="test" file="*" failure="Expected values to be loosely deep-equal:&#10;&#10;{&#10;  bar: 1,&#10;  baz: {&#10;    date: 1970-01-01T00:00:00.000Z,&#10;    null: null,&#10;    number: 1,&#10;    string: 'Hello',&#10;    undefined: undefined&#10;  },&#10;  boo: [&#10;    1&#10;  ],&#10;  foo: 1&#10;}&#10;&#10;should loosely deep-equal&#10;&#10;{&#10;  baz: {&#10;    date: 1970-01-01T00:00:00.000Z,&#10;    null: null,&#10;    number: 1,&#10;    string: 'Hello',&#10;    undefined: undefined&#10;  },&#10;  boo: [&#10;    1&#10;  ],&#10;  circular: &lt;ref *1> {&#10;    bar: 2,&#10;    c: [Circular *1]&#10;  }&#10;}">
+		<failure type="testCodeFailure" message="Expected values to be loosely deep-equal:&#10;&#10;{&#10;  bar: 1,&#10;  baz: {&#10;    date: 1970-01-01T00:00:00.000Z,&#10;    null: null,&#10;    number: 1,&#10;    string: 'Hello',&#10;    undefined: undefined&#10;  },&#10;  boo: [&#10;    1&#10;  ],&#10;  foo: 1&#10;}&#10;&#10;should loosely deep-equal&#10;&#10;{&#10;  baz: {&#10;    date: 1970-01-01T00:00:00.000Z,&#10;    null: null,&#10;    number: 1,&#10;    string: 'Hello',&#10;    undefined: undefined&#10;  },&#10;  boo: [&#10;    1&#10;  ],&#10;  circular: &lt;ref *1> {&#10;    bar: 2,&#10;    c: [Circular *1]&#10;  }&#10;}">
 [Error [ERR_TEST_FAILURE]: Expected values to be loosely deep-equal:
 
 {