Add test for failing test output

Cleanup parser tests.
Move test output to separate files.

go-junit-report_test.go

@@ -1,106 +1,123 @@
 package main
 
 import (
-	"strings"
+	"os"
 	"testing"
 )
 
-func TestOutputPass(t *testing.T) {
-	testOutputPass := `=== RUN TestOne
---- PASS: TestOne (0.06 seconds)
-=== RUN TestTwo
---- PASS: TestTwo (0.10 seconds)
-PASS
-ok  	package/name 0.160s`
+type TestCase struct {
+	name           string
+	expectedReport Report
+}
 
-	expected := Report{
-		Packages: []Package{
-			{
-				Name: "package/name",
-				Time: 160,
-				Tests: []Test{
-					{
-						Name:   "TestOne",
-						Time:   60,
-						Result: PASS,
-						Output: "",
-					},
-					{
-						Name:   "TestTwo",
-						Time:   100,
-						Result: PASS,
-						Output: "",
+var testCases []TestCase = []TestCase{
+	{
+		name: "01-pass.txt",
+		expectedReport: Report{
+			Packages: []Package{
+				{
+					Name: "package/name",
+					Time: 160,
+					Tests: []Test{
+						{
+							Name:   "TestOne",
+							Time:   60,
+							Result: PASS,
+							Output: "",
+						},
+						{
+							Name:   "TestTwo",
+							Time:   100,
+							Result: PASS,
+							Output: "",
+						},
 					},
 				},
 			},
 		},
-	}
+	},
+	{
+		name: "02-fail.txt",
+		expectedReport: Report{
+			Packages: []Package{
+				{
+					Name: "package/name",
+					Time: 151,
+					Tests: []Test{
+						{
+							Name:   "TestOne",
+							Time:   20,
+							Result: FAIL,
+							Output: "",
+						},
+						{
+							Name:   "TestTwo",
+							Time:   130,
+							Result: PASS,
+							Output: "",
+						},
+					},
+				},
+			},
+		},
+	},
+}
 
-	report, err := Parse(strings.NewReader(testOutputPass))
-	if err != nil {
-		t.Fatalf("error parsing: %s", err)
-	}
-
-	if report == nil {
-		t.Fatalf("Report == nil")
-	}
-
-	if len(report.Packages) != len(expected.Packages) {
-		t.Fatalf("Report packages == %d, want %d", len(report.Packages), len(expected.Packages))
-	}
-
-	for i, pkg := range report.Packages {
-		expPkg := expected.Packages[i]
-
-		if pkg.Name != expPkg.Name {
-			t.Errorf("Package.Name == %s, want %s", pkg.Name, expPkg.Name)
+func TestParser(t *testing.T) {
+	for _, testCase := range testCases {
+		file, err := os.Open("tests/" + testCase.name)
+		if err != nil {
+			t.Fatal(err)
 		}
 
-		if pkg.Time != expPkg.Time {
-			t.Errorf("Package.Time == %d, want %d", pkg.Time, expPkg.Time)
+		report, err := Parse(file)
+		if err != nil {
+			t.Fatalf("error parsing: %s", err)
 		}
 
-		if len(pkg.Tests) != len(expPkg.Tests) {
-			t.Fatalf("Package Tests == %d, want %d", len(pkg.Tests), len(expPkg.Tests))
+		if report == nil {
+			t.Fatalf("Report == nil")
 		}
 
-		for j, test := range pkg.Tests {
-			expTest := expPkg.Tests[j]
+		expected := testCase.expectedReport
+		if len(report.Packages) != len(expected.Packages) {
+			t.Fatalf("Report packages == %d, want %d", len(report.Packages), len(expected.Packages))
+		}
 
-			if test.Name != expTest.Name {
-				t.Errorf("Test.Name == %s, want %s", test.Name, expTest.Name)
+		for i, pkg := range report.Packages {
+			expPkg := expected.Packages[i]
+
+			if pkg.Name != expPkg.Name {
+				t.Errorf("Package.Name == %s, want %s", pkg.Name, expPkg.Name)
 			}
 
-			if test.Time != expTest.Time {
-				t.Errorf("Test.Time == %d, want %d", test.Time, expTest.Time)
+			if pkg.Time != expPkg.Time {
+				t.Errorf("Package.Time == %d, want %d", pkg.Time, expPkg.Time)
 			}
 
-			if test.Result != expTest.Result {
-				t.Errorf("Test.Result == %d, want %d", test.Result, expTest.Result)
+			if len(pkg.Tests) != len(expPkg.Tests) {
+				t.Fatalf("Package Tests == %d, want %d", len(pkg.Tests), len(expPkg.Tests))
 			}
 
-			if test.Output != expTest.Output {
-				t.Errorf("Test.Output == %s, want %s", test.Output, expTest.Output)
+			for j, test := range pkg.Tests {
+				expTest := expPkg.Tests[j]
+
+				if test.Name != expTest.Name {
+					t.Errorf("Test.Name == %s, want %s", test.Name, expTest.Name)
+				}
+
+				if test.Time != expTest.Time {
+					t.Errorf("Test.Time == %d, want %d", test.Time, expTest.Time)
+				}
+
+				if test.Result != expTest.Result {
+					t.Errorf("Test.Result == %d, want %d", test.Result, expTest.Result)
+				}
+
+				if test.Output != expTest.Output {
+					t.Errorf("Test.Output == %s, want %s", test.Output, expTest.Output)
+				}
 			}
 		}
 	}
 }
-
-const testOutputFail = `=== RUN TestOne
---- FAIL: TestOne (0.02 seconds)
-	file_test.go:11: Error message
-	file_test.go:11: Longer
-		error
-		message.
-=== RUN TestTwo
---- PASS: TestTwo (0.13 seconds)
-FAIL
-exit status 1
-FAIL	package/name 0.151s`
-
-func TestOutputFail(t *testing.T) {
-	_, err := Parse(strings.NewReader(testOutputFail))
-	if err != nil {
-		t.Fatalf("error parsing: %s", err)
-	}
-}

tests/01-pass.txt

@@ -0,0 +1,6 @@
+=== RUN TestOne
+--- PASS: TestOne (0.06 seconds)
+=== RUN TestTwo
+--- PASS: TestTwo (0.10 seconds)
+PASS
+ok  	package/name 0.160s

tests/02-fail.txt

@@ -0,0 +1,11 @@
+=== RUN TestOne
+--- FAIL: TestOne (0.02 seconds)
+	file_test.go:11: Error message
+	file_test.go:11: Longer
+		error
+		message.
+=== RUN TestTwo
+--- PASS: TestTwo (0.13 seconds)
+FAIL
+exit status 1
+FAIL	package/name 0.151s