Revert "Encode newlines for -ojunit as their XML equivalent instead of {newline}"

basvodde · web-flow · commit 9dbdc7b57fff · 2024-09-09T18:02:09.000+02:00
diff --git a/src/CppUTest/JUnitTestOutput.cpp b/src/CppUTest/JUnitTestOutput.cpp
@@ -209,8 +209,7 @@ SimpleString JUnitTestOutput::encodeXmlText(const SimpleString& textbody)
     buf.replace("\"", "&quot;");
     buf.replace("<", "&lt;");
     buf.replace(">", "&gt;");
-    buf.replace("\r", "&#13;");
-    buf.replace("\n", "&#10;");
+    buf.replace("\n", "{newline}");
     return buf;
 }
 
diff --git a/tests/CppUTest/JUnitOutputTest.cpp b/tests/CppUTest/JUnitOutputTest.cpp
@@ -544,7 +544,7 @@ TEST(JUnitOutputTest, testFailureWithNewlineInIt)
 
     outputFile = fileSystem.file("cpputest_testGroupWithFailingTest.xml");
 
-    STRCMP_EQUAL("<failure message=\"thisfile:10: Test &#10;    failed\" type=\"AssertionFailedError\">\n", outputFile->line(6));
+    STRCMP_EQUAL("<failure message=\"thisfile:10: Test {newline}failed\" type=\"AssertionFailedError\">\n", outputFile->line(6));
 }
 
 TEST(JUnitOutputTest, testFailureWithDifferentFileAndLine)
@@ -755,5 +755,5 @@ TEST(JUnitOutputTest, UTPRINTOutputInJUnitOutputWithSpecials)
             .end();
 
     outputFile = fileSystem.file("cpputest_groupname.xml");
-    STRCMP_EQUAL("<system-out>The &lt;rain&gt; in &quot;Spain&quot;&#10;    Goes \\mainly\\ down the Dr&amp;in&#10; </system-out>\n", outputFile->lineFromTheBack(3));
+    STRCMP_EQUAL("<system-out>The &lt;rain&gt; in &quot;Spain&quot;{newline}Goes \\mainly\\ down the Dr&amp;in{newline}</system-out>\n", outputFile->lineFromTheBack(3));
 }

Original file line number	Diff line number	Diff line change
`@@ -209,8 +209,7 @@ SimpleString JUnitTestOutput::encodeXmlText(const SimpleString& textbody)`
`209`	`209`	`buf.replace("\"", """);`
`210`	`210`	`buf.replace("<", "<");`
`211`	`211`	`buf.replace(">", ">");`
`212`		`- buf.replace("\r", " ");`
`213`		`- buf.replace("\n", " ");`
	`212`	`+ buf.replace("\n", "{newline}");`
`214`	`213`	`return buf;`
`215`	`214`	`}`
`216`	`215`
Original file line number	Diff line number	Diff line change
`@@ -544,7 +544,7 @@ TEST(JUnitOutputTest, testFailureWithNewlineInIt)`
`544`	`544`
`545`	`545`	`outputFile = fileSystem.file("cpputest_testGroupWithFailingTest.xml");`
`546`	`546`
`547`		`- STRCMP_EQUAL("<failure message=\"thisfile:10: Test failed\" type=\"AssertionFailedError\">\n", outputFile->line(6));`
	`547`	`+ STRCMP_EQUAL("<failure message=\"thisfile:10: Test {newline}failed\" type=\"AssertionFailedError\">\n", outputFile->line(6));`
`548`	`548`	`}`
`549`	`549`
`550`	`550`	`TEST(JUnitOutputTest, testFailureWithDifferentFileAndLine)`
`@@ -755,5 +755,5 @@ TEST(JUnitOutputTest, UTPRINTOutputInJUnitOutputWithSpecials)`
`755`	`755`	`.end();`
`756`	`756`
`757`	`757`	`outputFile = fileSystem.file("cpputest_groupname.xml");`
`758`		`- STRCMP_EQUAL("<system-out>The <rain> in "Spain" Goes \\mainly\\ down the Dr&in </system-out>\n", outputFile->lineFromTheBack(3));`
	`758`	`+ STRCMP_EQUAL("<system-out>The <rain> in "Spain"{newline}Goes \\mainly\\ down the Dr&in{newline}</system-out>\n", outputFile->lineFromTheBack(3));`
`759`	`759`	`}`