nhyatt/go-junit-report
1
0
Fork 0
mirror of https://github.com/jstemmer/go-junit-report.git synced 2025-04-04 12:40:15 -05:00
Code Issues Projects Releases Wiki Activity

Fix regular expression for summary with "no statements" coverage.

Browse Source 
Move the status message to the end of the regular expression.
This commit is contained in:
kevinwang 2022-08-29 18:58:51 +00:00
parent 7b10b42854
commit 9c64855bf7
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
parser/gotest/gotest.go
View File

@ -37,11 +37,12 @@ var (
`(?:\s+(\d+\.\d+)s)?` +
// 4: cached indicator (optional)
`(?:\s+(\(cached\)))?` +
// 5: [status message] (optional)
// 5: coverage percentage (optional)
// 6: coverage package list (optional)
`(?:\s+coverage:\s+(?:\[no\sstatements\]|(\d+\.\d+)%\sof\sstatements(?:\sin\s(.+))?))?` +
// 7: [status message] (optional)
`(?:\s+(\[[^\]]+\]))?` +
// 6: coverage percentage (optional)
// 7: coverage package list (optional)
`(?:\s+coverage:\s+(\d+\.\d+)%\sof\sstatements(?:\sin\s(.+))?)?$`)
`$`)
)
// Option defines options that can be passed to gotest.New.
@ -200,7 +201,7 @@ func (p *Parser) parseLine(line string) (events []Event) {
} else if matches := regexStatus.FindStringSubmatch(line); len(matches) == 2 {
return p.status(matches[1])
} else if matches := regexSummary.FindStringSubmatch(line); len(matches) == 8 {
return p.summary(matches[1], matches[2], matches[3], matches[4], matches[5], matches[6], matches[7])
return p.summary(matches[1], matches[2], matches[3], matches[4], matches[7], matches[5], matches[6])
} else if matches := regexCoverage.FindStringSubmatch(line); len(matches) == 3 {
return p.coverage(matches[1], matches[2])
} else if matches := regexBenchmark.FindStringSubmatch(line); len(matches) == 2 {

18
parser/gotest/gotest_test.go
View File

@ -91,6 +91,18 @@ var parseLineTests = []parseLineTest{
"ok package/other (cached)",
[]Event{{Type: "summary", Name: "package/other", Result: "ok", Data: "(cached)"}},
},
{
"ok package/name 0.400s coverage: [no statements]",
[]Event{{Type: "summary", Name: "package/name", Result: "ok", Duration: 400 * time.Millisecond}},
},
{
"ok package/name 0.400s (cached) coverage: [no statements]",
[]Event{{Type: "summary", Name: "package/name", Result: "ok", Duration: 400 * time.Millisecond, Data: "(cached)"}},
},
{
"ok package/name 0.001s coverage: [no statements] [no tests to run]",
[]Event{{Type: "summary", Name: "package/name", Result: "ok", Duration: 1 * time.Millisecond, Data: "[no tests to run]"}},
},
{
"ok package/name 0.400s coverage: 10.0% of statements",
[]Event{{Type: "summary", Name: "package/name", Result: "ok", Duration: 400 * time.Millisecond, CovPct: 10}},
@ -111,6 +123,10 @@ var parseLineTests = []parseLineTest{
"ok package/name (cached) [no tests to run]",
[]Event{{Type: "summary", Name: "package/name", Result: "ok", Data: "(cached) [no tests to run]"}},
},
{
"ok package/name 0.042s coverage: 0.0% of statements [no tests to run]",
[]Event{{Type: "summary", Name: "package/name", Result: "ok", Duration: 42 * time.Millisecond, CovPct: 0, Data: "[no tests to run]"}},
},
{
"coverage: 10% of statements",
[]Event{{Type: "coverage", CovPct: 10}},
@ -199,7 +215,7 @@ func TestParseLine(t *testing.T) {
t.Run(name, func(t *testing.T) {
parser := NewParser()
events := parser.parseLine(test.input)
if diff := cmp.Diff(events, test.events); diff != "" {
if diff := cmp.Diff(test.events, events); diff != "" {
t.Errorf("parseLine(%q) returned unexpected events, diff (-want, +got):\n%v", test.input, diff)
}
})