From 7c195be87f59a0837947795684dc4c6b0a0bf8e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=ABl=20Stemmer?= <stemmertech@gmail.com>
Date: Fri, 13 May 2022 21:01:49 +0100
Subject: [PATCH] Do not trim output whitespace prefix

Whitespace prefix of output lines was carried over from the old v1
version, but in some cases it removes too much whitespace. Ideally it
would detect the common prefix of all output lines for a given text and
only trim that. Until that's fixed, let's just stop removing the
whitespace.

Fixes #131
---
 junit/junit.go          |  2 +-
 testdata/002-report.xml |  8 ++++----
 testdata/003-report.xml |  2 +-
 testdata/006-report.xml |  8 ++++----
 testdata/012-report.xml | 12 ++++++------
 testdata/017-report.xml |  2 +-
 testdata/020-report.xml |  6 +++---
 testdata/030-report.xml | 32 ++++++++++++++++----------------
 testdata/101-report.xml |  8 ++++----
 testdata/103-report.xml |  2 +-
 testdata/104-report.xml |  4 ++--
 testdata/107-report.xml |  4 ++--
 testdata/112-report.xml | 12 ++++++------
 13 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/junit/junit.go b/junit/junit.go
index 69c9046..aec28b9 100644
--- a/junit/junit.go
+++ b/junit/junit.go
@@ -259,7 +259,7 @@ func formatBenchmarkTime(d time.Duration) string {
 func formatOutput(output []string, indent int) string {
 	var lines []string
 	for _, line := range output {
-		lines = append(lines, gtr.TrimPrefixSpaces(line, indent))
+		lines = append(lines, line)
 	}
 	return strings.Join(lines, "\n")
 }
diff --git a/testdata/002-report.xml b/testdata/002-report.xml
index 06a003f..89380ca 100644
--- a/testdata/002-report.xml
+++ b/testdata/002-report.xml
@@ -5,10 +5,10 @@
 			<property name="go.version" value="1.0"></property>
 		</properties>
 		<testcase name="TestOne" classname="package/name" time="0.020">
-			<failure message="Failed"><![CDATA[file_test.go:11: Error message
-file_test.go:11: Longer
-	error
-	message.]]></failure>
+			<failure message="Failed"><![CDATA[	file_test.go:11: Error message
+	file_test.go:11: Longer
+		error
+		message.]]></failure>
 		</testcase>
 		<testcase name="TestTwo" classname="package/name" time="0.130"></testcase>
 		<system-out><![CDATA[exit status 1]]></system-out>
diff --git a/testdata/003-report.xml b/testdata/003-report.xml
index 92c1506..2fe012b 100644
--- a/testdata/003-report.xml
+++ b/testdata/003-report.xml
@@ -5,7 +5,7 @@
 			<property name="go.version" value="1.0"></property>
 		</properties>
 		<testcase name="TestOne" classname="package/name" time="0.020">
-			<skipped message="Skipped"><![CDATA[file_test.go:11: Skip message]]></skipped>
+			<skipped message="Skipped"><![CDATA[	file_test.go:11: Skip message]]></skipped>
 		</testcase>
 		<testcase name="TestTwo" classname="package/name" time="0.130"></testcase>
 	</testsuite>
diff --git a/testdata/006-report.xml b/testdata/006-report.xml
index 7994e4b..fb081e2 100644
--- a/testdata/006-report.xml
+++ b/testdata/006-report.xml
@@ -11,10 +11,10 @@
 			<property name="go.version" value="1.0"></property>
 		</properties>
 		<testcase name="TestOne" classname="package/name2" time="0.020">
-			<failure message="Failed"><![CDATA[file_test.go:11: Error message
-file_test.go:11: Longer
-	error
-	message.]]></failure>
+			<failure message="Failed"><![CDATA[	file_test.go:11: Error message
+	file_test.go:11: Longer
+		error
+		message.]]></failure>
 		</testcase>
 		<testcase name="TestTwo" classname="package/name2" time="0.130"></testcase>
 		<system-out><![CDATA[exit status 1]]></system-out>
diff --git a/testdata/012-report.xml b/testdata/012-report.xml
index b58a8b1..659b959 100644
--- a/testdata/012-report.xml
+++ b/testdata/012-report.xml
@@ -20,19 +20,19 @@
 			<failure message="Failed"></failure>
 		</testcase>
 		<testcase name="TestFour/#00" classname="package/name" time="0.000">
-			<failure message="Failed"><![CDATA[example.go:12: Expected abc  OBTAINED:
-	xyz
-example.go:123: Expected and obtained are different.]]></failure>
+			<failure message="Failed"><![CDATA[    	example.go:12: Expected abc  OBTAINED:
+    		xyz
+    	example.go:123: Expected and obtained are different.]]></failure>
 		</testcase>
 		<testcase name="TestFour/#01" classname="package/name" time="0.000">
-			<skipped message="Skipped"><![CDATA[example.go:1234: Not supported yet.]]></skipped>
+			<skipped message="Skipped"><![CDATA[    	example.go:1234: Not supported yet.]]></skipped>
 		</testcase>
 		<testcase name="TestFour/#02" classname="package/name" time="0.000"></testcase>
 		<testcase name="TestFive" classname="package/name" time="0.000">
-			<skipped message="Skipped"><![CDATA[example.go:1392: Not supported yet.]]></skipped>
+			<skipped message="Skipped"><![CDATA[	example.go:1392: Not supported yet.]]></skipped>
 		</testcase>
 		<testcase name="TestSix" classname="package/name" time="0.000">
-			<failure message="Failed"><![CDATA[example.go:371: This should not fail!]]></failure>
+			<failure message="Failed"><![CDATA[	example.go:371: This should not fail!]]></failure>
 		</testcase>
 	</testsuite>
 </testsuites>
diff --git a/testdata/017-report.xml b/testdata/017-report.xml
index d272124..a216621 100644
--- a/testdata/017-report.xml
+++ b/testdata/017-report.xml
@@ -39,7 +39,7 @@ Goroutine 6 (running) created at:
   main.main()
       _test/_testmain.go:52 +0x20f
 ==================
-testing.go:610: race detected during execution of test]]></failure>
+	testing.go:610: race detected during execution of test]]></failure>
 		</testcase>
 		<system-out><![CDATA[exit status 1]]></system-out>
 	</testsuite>
diff --git a/testdata/020-report.xml b/testdata/020-report.xml
index b78f72d..237bb6c 100644
--- a/testdata/020-report.xml
+++ b/testdata/020-report.xml
@@ -7,15 +7,15 @@
 		<testcase name="FirstTest" classname="pkg/parallel" time="2.000">
 			<failure message="Failed"><![CDATA[Message from first
 Supplemental from first
-parallel_test.go:14: FirstTest error]]></failure>
+	parallel_test.go:14: FirstTest error]]></failure>
 		</testcase>
 		<testcase name="SecondTest" classname="pkg/parallel" time="1.000">
 			<failure message="Failed"><![CDATA[Message from second
-parallel_test.go:23: SecondTest error]]></failure>
+	parallel_test.go:23: SecondTest error]]></failure>
 		</testcase>
 		<testcase name="ThirdTest" classname="pkg/parallel" time="0.010">
 			<failure message="Failed"><![CDATA[Message from third
-parallel_test.go:32: ThirdTest error]]></failure>
+	parallel_test.go:32: ThirdTest error]]></failure>
 		</testcase>
 		<system-out><![CDATA[exit status 1]]></system-out>
 	</testsuite>
diff --git a/testdata/030-report.xml b/testdata/030-report.xml
index 8e91aae..4a1c365 100644
--- a/testdata/030-report.xml
+++ b/testdata/030-report.xml
@@ -9,10 +9,10 @@
 line
 stdout
 single-line stdout
-example_test.go:13: single-line error
-example_test.go:14: multi
-    line
-    error]]></failure>
+    example_test.go:13: single-line error
+    example_test.go:14: multi
+        line
+        error]]></failure>
 		</testcase>
 		<testcase name="TestFailWithStdoutAndNoTestOutput" classname="package/name1" time="0.150">
 			<failure message="Failed"><![CDATA[multi
@@ -21,10 +21,10 @@ stdout
 single-line stdout]]></failure>
 		</testcase>
 		<testcase name="TestFailWithTestOutput" classname="package/name1" time="0.200">
-			<failure message="Failed"><![CDATA[example_test.go:26: single-line error
-example_test.go:27: multi
-    line
-    error]]></failure>
+			<failure message="Failed"><![CDATA[    example_test.go:26: single-line error
+    example_test.go:27: multi
+        line
+        error]]></failure>
 		</testcase>
 		<testcase name="TestFailWithNoTestOutput" classname="package/name1" time="0.250">
 			<failure message="Failed"></failure>
@@ -41,10 +41,10 @@ example_test.go:27: multi
 line
 stdout
 1 single-line stdout
-example_test.go:65: 1 single-line error
-example_test.go:66: 1 multi
-    line
-    error]]></failure>
+        example_test.go:65: 1 single-line error
+        example_test.go:66: 1 multi
+            line
+            error]]></failure>
 		</testcase>
 		<testcase name="TestSubtests/TestFailWithStdoutAndNoTestOutput" classname="package/name1" time="0.150">
 			<failure message="Failed"><![CDATA[2 multi
@@ -53,10 +53,10 @@ stdout
 2 single-line stdout]]></failure>
 		</testcase>
 		<testcase name="TestSubtests/TestFailWithTestOutput" classname="package/name1" time="0.200">
-			<failure message="Failed"><![CDATA[example_test.go:78: 3 single-line error
-example_test.go:79: 3 multi
-    line
-    error]]></failure>
+			<failure message="Failed"><![CDATA[        example_test.go:78: 3 single-line error
+        example_test.go:79: 3 multi
+            line
+            error]]></failure>
 		</testcase>
 		<testcase name="TestSubtests/TestFailWithNoTestOutput" classname="package/name1" time="0.250">
 			<failure message="Failed"></failure>
diff --git a/testdata/101-report.xml b/testdata/101-report.xml
index 47bdb40..c7c9114 100644
--- a/testdata/101-report.xml
+++ b/testdata/101-report.xml
@@ -5,10 +5,10 @@
 			<property name="go.version" value="1.0"></property>
 		</properties>
 		<testcase name="TestOne" classname="package/name/fail" time="0.000">
-			<failure message="Failed"><![CDATA[main_test.go:6: Error message
-main_test.go:7: Longer
-    error
-    message.]]></failure>
+			<failure message="Failed"><![CDATA[    main_test.go:6: Error message
+    main_test.go:7: Longer
+        error
+        message.]]></failure>
 		</testcase>
 		<testcase name="TestTwo" classname="package/name/fail" time="0.000"></testcase>
 		<system-out><![CDATA[exit status 1]]></system-out>
diff --git a/testdata/103-report.xml b/testdata/103-report.xml
index a9aae8b..bebcb4f 100644
--- a/testdata/103-report.xml
+++ b/testdata/103-report.xml
@@ -9,7 +9,7 @@
 		</testcase>
 		<testcase name="TestMultiple/Empty_string" classname="package/name/subtest" time="0.000"></testcase>
 		<testcase name="TestMultiple/Single" classname="package/name/subtest" time="0.000">
-			<failure message="Failed"><![CDATA[pkg_test.go:20: Do("a"): got aaaaaaaaaa, want a]]></failure>
+			<failure message="Failed"><![CDATA[    pkg_test.go:20: Do("a"): got aaaaaaaaaa, want a]]></failure>
 		</testcase>
 		<testcase name="TestMultiple/Multi" classname="package/name/subtest" time="0.000"></testcase>
 		<system-out><![CDATA[exit status 1]]></system-out>
diff --git a/testdata/104-report.xml b/testdata/104-report.xml
index 7916635..39b647d 100644
--- a/testdata/104-report.xml
+++ b/testdata/104-report.xml
@@ -45,9 +45,9 @@ Goroutine 7 (running) created at:
   main.main()
       _testmain.go:47 +0x2e4
 ==================
-testing.go:1312: race detected during execution of test]]></failure>
+    testing.go:1312: race detected during execution of test]]></failure>
 		</testcase>
-		<system-out><![CDATA[testing.go:1312: race detected during execution of test
+		<system-out><![CDATA[    testing.go:1312: race detected during execution of test
 exit status 1]]></system-out>
 	</testsuite>
 </testsuites>
diff --git a/testdata/107-report.xml b/testdata/107-report.xml
index c5e050f..bfd72e8 100644
--- a/testdata/107-report.xml
+++ b/testdata/107-report.xml
@@ -5,10 +5,10 @@
 			<property name="go.version" value="1.0"></property>
 		</properties>
 		<testcase name="TestSkip" classname="package/name/skip" time="0.000">
-			<skipped message="Skipped"><![CDATA[skip_test.go:6: skip message]]></skipped>
+			<skipped message="Skipped"><![CDATA[    skip_test.go:6: skip message]]></skipped>
 		</testcase>
 		<testcase name="TestSkipNow" classname="package/name/skip" time="0.000">
-			<skipped message="Skipped"><![CDATA[skip_test.go:10: log message]]></skipped>
+			<skipped message="Skipped"><![CDATA[    skip_test.go:10: log message]]></skipped>
 		</testcase>
 	</testsuite>
 </testsuites>
diff --git a/testdata/112-report.xml b/testdata/112-report.xml
index 41934eb..f08b135 100644
--- a/testdata/112-report.xml
+++ b/testdata/112-report.xml
@@ -5,19 +5,19 @@
 			<property name="go.version" value="1.0"></property>
 		</properties>
 		<testcase name="TestP1" classname="package/name/parallel" time="0.000">
-			<failure message="Failed"><![CDATA[pkg_test.go:10: t.Log(P1)
+			<failure message="Failed"><![CDATA[    pkg_test.go:10: t.Log(P1)
 fmt.Printf(P1)
-pkg_test.go:14: P1 error]]></failure>
+    pkg_test.go:14: P1 error]]></failure>
 		</testcase>
 		<testcase name="TestP2" classname="package/name/parallel" time="0.000">
-			<failure message="Failed"><![CDATA[pkg_test.go:19: t.Log(P2)
+			<failure message="Failed"><![CDATA[    pkg_test.go:19: t.Log(P2)
 fmt.Printf(P2)
-pkg_test.go:23: P2 error]]></failure>
+    pkg_test.go:23: P2 error]]></failure>
 		</testcase>
 		<testcase name="TestP3" classname="package/name/parallel" time="0.000">
-			<failure message="Failed"><![CDATA[pkg_test.go:28: t.Log(P3)
+			<failure message="Failed"><![CDATA[    pkg_test.go:28: t.Log(P3)
 fmt.Printf(P3)
-pkg_test.go:32: P3 error]]></failure>
+    pkg_test.go:32: P3 error]]></failure>
 		</testcase>
 		<system-out><![CDATA[exit status 1]]></system-out>
 	</testsuite>