From 24d394d799b2d31260005b1ac2251e3512836e37 Mon Sep 17 00:00:00 2001 From: Patrick O'brien Date: Tue, 16 Aug 2016 17:07:54 +1000 Subject: [PATCH 1/2] Add go 1.7 compatibility * Subtests and nested subtests have spaces at the beginning of their PASS statements. This has been added to the regexp. --- go-junit-report_test.go | 86 +++++++++++++++++++++++++++++++++++++++++ parser/parser.go | 2 +- tests/12-go_1_7.txt | 26 +++++++++++++ tests/12-report.xml | 20 ++++++++++ 4 files changed, 133 insertions(+), 1 deletion(-) create mode 100644 tests/12-go_1_7.txt create mode 100644 tests/12-report.xml diff --git a/go-junit-report_test.go b/go-junit-report_test.go index 76b5669..ccd50e3 100644 --- a/go-junit-report_test.go +++ b/go-junit-report_test.go @@ -355,6 +355,92 @@ 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{}, + }, + }, + }, + }, + }, + }, } func TestParser(t *testing.T) { diff --git a/parser/parser.go b/parser/parser.go index e2b6650..a6844e1 100644 --- a/parser/parser.go +++ b/parser/parser.go @@ -40,7 +40,7 @@ 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)?$`) ) diff --git a/tests/12-go_1_7.txt b/tests/12-go_1_7.txt new file mode 100644 index 0000000..de88b1f --- /dev/null +++ b/tests/12-go_1_7.txt @@ -0,0 +1,26 @@ +=== 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) +PASS +ok package/name 0.050s diff --git a/tests/12-report.xml b/tests/12-report.xml new file mode 100644 index 0000000..bb21c90 --- /dev/null +++ b/tests/12-report.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + From faed36da238af958cce58415efb18cd5bb332131 Mon Sep 17 00:00:00 2001 From: Aiden Scandella Date: Mon, 12 Sep 2016 09:59:52 -0700 Subject: [PATCH 2/2] Fix 1.7 compatbility --- .travis.yml | 2 ++ go-junit-report_test.go | 48 ++++++++++++++++++++++++++++++++++++++++- parser/parser.go | 9 +++++--- tests/12-go_1_7.txt | 40 ++++++++++++++++++++++++---------- tests/12-report.xml | 20 +++++++++++++++-- 5 files changed, 102 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index 89bf2e0..95c3c86 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,8 @@ language: go go: - tip + - 1.7 + - 1.6 - 1.5 - 1.4.2 - 1.3.3 diff --git a/go-junit-report_test.go b/go-junit-report_test.go index ccd50e3..4b23b44 100644 --- a/go-junit-report_test.go +++ b/go-junit-report_test.go @@ -436,6 +436,52 @@ var testCases = []TestCase{ 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!", + }, + }, }, }, }, @@ -499,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 { diff --git a/parser/parser.go b/parser/parser.go index a6844e1..88da817 100644 --- a/parser/parser.go +++ b/parser/parser.go @@ -43,6 +43,7 @@ var ( 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") { - // test output + } else if matches := regexOutput.FindStringSubmatch(line); len(matches) == 3 { + // 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]) } } diff --git a/tests/12-go_1_7.txt b/tests/12-go_1_7.txt index de88b1f..81f07d5 100644 --- a/tests/12-go_1_7.txt +++ b/tests/12-go_1_7.txt @@ -3,24 +3,42 @@ === 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) + --- 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) + --- 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) -PASS -ok package/name 0.050s + --- 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 diff --git a/tests/12-report.xml b/tests/12-report.xml index bb21c90..75cc605 100644 --- a/tests/12-report.xml +++ b/tests/12-report.xml @@ -1,8 +1,8 @@ - + - + @@ -16,5 +16,21 @@ + + + + + example.go:12: Expected abc OBTAINED: xyz example.go:123: Expected and obtained are different. + + + + + + + + + + example.go:371: This should not fail! +