Merge pull request #40 from sectioneight/fix-1.7-compat

Add support for sub-tests in 1.7

.travis.yml

@@ -2,6 +2,8 @@ language: go
 
 go:
   - tip
+  - 1.7
+  - 1.6
   - 1.5
   - 1.4.2
   - 1.3.3

go-junit-report_test.go

@@ -355,6 +355,138 @@ var testCases = []TestCase{
 			},
 		},
 	},
+	{
+		name:       "12-go_1_7.txt",
+		reportName: "12-report.xml",
+		report: &parser.Report{
+			Packages: []parser.Package{
+				{
+					Name: "package/name",
+					Time: 50,
+					Tests: []*parser.Test{
+						{
+							Name:   "TestOne",
+							Time:   10,
+							Result: parser.PASS,
+							Output: []string{},
+						},
+						{
+							Name:   "TestOne/Child",
+							Time:   20,
+							Result: parser.PASS,
+							Output: []string{},
+						},
+						{
+							Name:   "TestOne/Child#01",
+							Time:   30,
+							Result: parser.PASS,
+							Output: []string{},
+						},
+						{
+							Name:   "TestOne/Child=02",
+							Time:   40,
+							Result: parser.PASS,
+							Output: []string{},
+						},
+						{
+							Name:   "TestTwo",
+							Time:   10,
+							Result: parser.PASS,
+							Output: []string{},
+						},
+						{
+							Name:   "TestTwo/Child",
+							Time:   20,
+							Result: parser.PASS,
+							Output: []string{},
+						},
+						{
+							Name:   "TestTwo/Child#01",
+							Time:   30,
+							Result: parser.PASS,
+							Output: []string{},
+						},
+						{
+							Name:   "TestTwo/Child=02",
+							Time:   40,
+							Result: parser.PASS,
+							Output: []string{},
+						},
+						{
+							Name:   "TestThree",
+							Time:   10,
+							Result: parser.PASS,
+							Output: []string{},
+						},
+						{
+							Name:   "TestThree/a#1",
+							Time:   20,
+							Result: parser.PASS,
+							Output: []string{},
+						},
+						{
+							Name:   "TestThree/a#1/b#1",
+							Time:   30,
+							Result: parser.PASS,
+							Output: []string{},
+						},
+						{
+							Name:   "TestThree/a#1/b#1/c#1",
+							Time:   40,
+							Result: parser.PASS,
+							Output: []string{},
+						},
+						{
+							Name:   "TestFour",
+							Time:   20,
+							Result: parser.FAIL,
+							Output: []string{},
+						},
+						{
+							Name:   "TestFour/#00",
+							Time:   0,
+							Result: parser.FAIL,
+							Output: []string{
+								"example.go:12: Expected abc  OBTAINED:",
+								"	xyz",
+								"example.go:123: Expected and obtained are different.",
+							},
+						},
+						{
+							Name:   "TestFour/#01",
+							Time:   0,
+							Result: parser.SKIP,
+							Output: []string{
+								"example.go:1234: Not supported yet.",
+							},
+						},
+						{
+							Name:   "TestFour/#02",
+							Time:   0,
+							Result: parser.PASS,
+							Output: []string{},
+						},
+						{
+							Name:   "TestFive",
+							Time:   0,
+							Result: parser.SKIP,
+							Output: []string{
+								"example.go:1392: Not supported yet.",
+							},
+						},
+						{
+							Name:   "TestSix",
+							Time:   0,
+							Result: parser.FAIL,
+							Output: []string{
+								"example.go:371: This should not fail!",
+							},
+						},
+					},
+				},
+			},
+		},
+	},
 }
 
 func TestParser(t *testing.T) {
@@ -413,7 +545,7 @@ func TestParser(t *testing.T) {
 				testOutput := strings.Join(test.Output, "\n")
 				expTestOutput := strings.Join(expTest.Output, "\n")
 				if testOutput != expTestOutput {
-					t.Errorf("Test.Output ==\n%s\n, want\n%s", testOutput, expTestOutput)
+					t.Errorf("Test.Output (%s) ==\n%s\n, want\n%s", test.Name, testOutput, expTestOutput)
 				}
 			}
 			if pkg.CoveragePct != expPkg.CoveragePct {

parser/parser.go

@@ -40,9 +40,10 @@ type Test struct {
 }
 
 var (
-	regexStatus   = regexp.MustCompile(`^--- (PASS|FAIL|SKIP): (.+) \((\d+\.\d+)(?: seconds|s)\)$`)
+	regexStatus   = regexp.MustCompile(`^\s*--- (PASS|FAIL|SKIP): (.+) \((\d+\.\d+)(?: seconds|s)\)$`)
 	regexCoverage = regexp.MustCompile(`^coverage:\s+(\d+\.\d+)%\s+of\s+statements$`)
 	regexResult   = regexp.MustCompile(`^(ok|FAIL)\s+(.+)\s(\d+\.\d+)s(?:\s+coverage:\s+(\d+\.\d+)%\s+of\s+statements)?$`)
+	regexOutput   = regexp.MustCompile(`(    )*\t(.*)`)
 )
 
 // Parse parses go test output from reader r and returns a report with the
@@ -123,13 +124,15 @@ func Parse(r io.Reader, pkgName string) (*Report, error) {
 			testsTime += testTime
 		} else if matches := regexCoverage.FindStringSubmatch(line); len(matches) == 2 {
 			coveragePct = matches[1]
-		} else if strings.HasPrefix(line, "\t") {
+		} else if matches := regexOutput.FindStringSubmatch(line); len(matches) == 3 {
-			// test output
+			// Sub-tests start with one or more series of 4-space indents, followed by a hard tab,
+			// followed by the test output
+			// Top-level tests start with a hard tab.
 			test := findTest(tests, cur)
 			if test == nil {
 				continue
 			}
-			test.Output = append(test.Output, line[1:])
+			test.Output = append(test.Output, matches[2])
 		}
 	}
 

tests/12-go_1_7.txt

@@ -0,0 +1,44 @@
+=== RUN   TestOne
+=== RUN   TestOne/Child
+=== RUN   TestOne/Child#01
+=== RUN   TestOne/Child=02
+--- PASS: TestOne (0.01s)
+	--- PASS: TestOne/Child (0.02s)
+	--- PASS: TestOne/Child#01 (0.03s)
+	--- PASS: TestOne/Child=02 (0.04s)
+=== RUN   TestTwo
+=== RUN   TestTwo/Child
+=== RUN   TestTwo/Child#01
+=== RUN   TestTwo/Child=02
+--- PASS: TestTwo (0.01s)
+	--- PASS: TestTwo/Child (0.02s)
+	--- PASS: TestTwo/Child#01 (0.03s)
+	--- PASS: TestTwo/Child=02 (0.04s)
+=== RUN   TestThree
+=== RUN   TestThree/a#1
+=== RUN   TestThree/a#1/b#1
+=== RUN   TestThree/a#1/b#1/c#1
+--- PASS: TestThree (0.01s)
+	--- PASS: TestThree/a#1 (0.02s)
+		--- PASS: TestThree/a#1/b#1 (0.03s)
+			--- PASS: TestThree/a#1/b#1/c#1 (0.04s)
+=== RUN   TestFour
+=== RUN   TestFour/#00
+=== RUN   TestFour/#01
+=== RUN   TestFour/#02
+--- FAIL: TestFour (0.02s)
+	--- FAIL: TestFour/#00 (0.00s)
+    	example.go:12: Expected abc  OBTAINED:
+    		xyz
+    	example.go:123: Expected and obtained are different.
+	--- SKIP: TestFour/#01 (0.00s)
+    	example.go:1234: Not supported yet.
+	--- PASS: TestFour/#02 (0.00s)
+=== RUN   TestFive
+--- SKIP: TestFive (0.00s)
+	example.go:1392: Not supported yet.
+=== RUN   TestSix
+--- FAIL: TestSix (0.00s)
+	example.go:371: This should not fail!
+FAIL
+FAIL	package/name	0.050s

tests/12-report.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuites>
+	<testsuite tests="18" failures="3" time="0.050" name="package/name">
+		<properties>
+			<property name="go.version" value="1.0"></property>
+		</properties>
+		<testcase classname="name" name="TestOne" time="0.010"></testcase>
+		<testcase classname="name" name="TestOne/Child" time="0.020"></testcase>
+		<testcase classname="name" name="TestOne/Child#01" time="0.030"></testcase>
+		<testcase classname="name" name="TestOne/Child=02" time="0.040"></testcase>
+		<testcase classname="name" name="TestTwo" time="0.010"></testcase>
+		<testcase classname="name" name="TestTwo/Child" time="0.020"></testcase>
+		<testcase classname="name" name="TestTwo/Child#01" time="0.030"></testcase>
+		<testcase classname="name" name="TestTwo/Child=02" time="0.040"></testcase>
+		<testcase classname="name" name="TestThree" time="0.010"></testcase>
+		<testcase classname="name" name="TestThree/a#1" time="0.020"></testcase>
+		<testcase classname="name" name="TestThree/a#1/b#1" time="0.030"></testcase>
+		<testcase classname="name" name="TestThree/a#1/b#1/c#1" time="0.040"></testcase>
+		<testcase classname="name" name="TestFour" time="0.020">
+			<failure message="Failed" type=""></failure>
+		</testcase>
+		<testcase classname="name" name="TestFour/#00" time="0.000">
+			<failure message="Failed" type="">example.go:12: Expected abc  OBTAINED:&#xA;&#x9;xyz&#xA;example.go:123: Expected and obtained are different.</failure>
+		</testcase>
+		<testcase classname="name" name="TestFour/#01" time="0.000">
+			<skipped message="example.go:1234: Not supported yet."></skipped>
+		</testcase>
+		<testcase classname="name" name="TestFour/#02" time="0.000"></testcase>
+		<testcase classname="name" name="TestFive" time="0.000">
+			<skipped message="example.go:1392: Not supported yet."></skipped>
+		</testcase>
+		<testcase classname="name" name="TestSix" time="0.000">
+			<failure message="Failed" type="">example.go:371: This should not fail!</failure>
+		</testcase>
+	</testsuite>
+</testsuites>