Use xml.EscapeText

Author: janisz

junit/junit.go

@@ -3,6 +3,7 @@
 package junit
 
 import (
+	"bytes"
 	"encoding/xml"
 	"fmt"
 	"strings"
@@ -235,6 +236,16 @@ func formatDuration(d time.Duration) string {
 }
 
 // formatOutput combines the lines from the given output into a single string.
-func formatOutput(output []string, indent int) string {
-	return strings.Join(output, "\n")
+func formatOutput(output []string, _ int) string {
+	buf := bytes.NewBufferString("")
+	for i, o := range output {
+		err := xml.EscapeText(buf, []byte(o))
+		if err != nil {
+			return "formatOutput: " + err.Error()
+		}
+		if i < len(output)-1 {
+			buf.WriteString("\n")
+		}
+	}
+	return buf.String()
 }

junit/junit_test.go

@@ -26,6 +26,11 @@ func TestCreateFromReport(t *testing.T) {
 						Result: gtr.Pass,
 						Output: []string{"ok"},
 					},
+					{
+						Name:   "TestEscapeOutput",
+						Result: gtr.Pass,
+						Output: []string{"\x00\v\f \t\\"},
+					},
 					{
 						Name:   "TestFail",
 						Result: gtr.Fail,
@@ -47,14 +52,14 @@ func TestCreateFromReport(t *testing.T) {
 	}
 
 	want := Testsuites{
-		Tests:    6,
+		Tests:    7,
 		Errors:   3,
 		Failures: 1,
 		Skipped:  1,
 		Suites: []Testsuite{
 			{
 				Name:      "package/name",
-				Tests:     6,
+				Tests:     7,
 				Errors:    3,
 				ID:        0,
 				Failures:  1,
@@ -72,6 +77,12 @@ func TestCreateFromReport(t *testing.T) {
 						Time:      "0.000",
 						SystemOut: &Output{Data: "ok"},
 					},
+					{
+						Name:      "TestEscapeOutput",
+						Classname: "package/name",
+						Time:      "0.000",
+						SystemOut: &Output{Data: `��� 	\`},
+					},
 					{
 						Name:      "TestFail",
 						Classname: "package/name",