From 9c64855bf7ac3713f973dd2a936b609f0b02e5df Mon Sep 17 00:00:00 2001
From: kevinwang <kevinwang@bytedance.com>
Date: Mon, 29 Aug 2022 18:58:51 +0000
Subject: [PATCH] Fix regular expression for summary with "no statements"
 coverage.

Move the status message to the end of the regular expression.
---
 parser/gotest/gotest.go      | 11 ++++++-----
 parser/gotest/gotest_test.go | 18 +++++++++++++++++-
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/parser/gotest/gotest.go b/parser/gotest/gotest.go
index bc263fe..2f38282 100644
--- a/parser/gotest/gotest.go
+++ b/parser/gotest/gotest.go
@@ -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 {
diff --git a/parser/gotest/gotest_test.go b/parser/gotest/gotest_test.go
index ff3e1ba..e4ec5a5 100644
--- a/parser/gotest/gotest_test.go
+++ b/parser/gotest/gotest_test.go
@@ -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)
 			}
 		})