Fixes #2: Incorrect parsing of Testify output (#3)

* Fixes #2: Incorrect parsing of Testify output

* Added artifact build

* Added non-verbose self-test

* Longer buffering

.github/workflows/build.yaml

@@ -97,7 +97,11 @@ jobs:
       - name: Run self-test
         run: |
           set -euo pipefail
-          go test -v ./... 2>&1 | tee /tmp/gotest.log | go run ./cmd/gotestfmt
+          go test ./... 2>&1 | tee /tmp/gotest.log | go run ./cmd/gotestfmt
+      - name: Run self-test (verbose)
+        run: |
+          set -euo pipefail
+          go test -v ./... 2>&1 | tee /tmp/gotest-verbose.log | go run ./cmd/gotestfmt
       - name: Upload test log
         uses: actions/upload-artifact@v2
         with:
@@ -132,3 +136,8 @@ jobs:
           args: release --rm-dist
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: binaries
+          path: dist

_testsource/testify/go.mod

@@ -0,0 +1,7 @@
+module "github.com/haveyoudebuggedit/example"
+
+go 1.16
+
+require (
+	github.com/stretchr/testify v1.7.0
+)

_testsource/testify/go.sum

@@ -0,0 +1,10 @@
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

_testsource/testify/testify.go

@@ -0,0 +1 @@
+package testify

_testsource/testify/testify_test.go

@@ -0,0 +1,12 @@
+package testify
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestTestify(t *testing.T) {
+	assert.Equal(t, 50, 48)
+
+}

_testsource/testifymultipackage/go.mod

@@ -0,0 +1,7 @@
+module "github.com/haveyoudebuggedit/example"
+
+go 1.16
+
+require (
+	github.com/stretchr/testify v1.7.0
+)

_testsource/testifymultipackage/go.sum

@@ -0,0 +1,10 @@
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

_testsource/testifymultipackage/subpackage1/testify.go

@@ -0,0 +1 @@
+package subpackage1

_testsource/testifymultipackage/subpackage1/testify_test.go

@@ -0,0 +1,12 @@
+package subpackage1
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestTestify(t *testing.T) {
+	assert.Equal(t, 50, 50)
+
+}

_testsource/testifymultipackage/subpackage2/testify.go

@@ -0,0 +1 @@
+package subpackage1

_testsource/testifymultipackage/subpackage2/testify_test.go

@@ -0,0 +1,11 @@
+package subpackage1
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestTestify(t *testing.T) {
+	assert.Equal(t, 50, 48)
+}

parser/parse.go

@@ -39,6 +39,8 @@ func parse(
 	}
 	pkgTracker := &packageTracker{
 		currentPackage:  nil,
+		packageList:     []*Package{},
+		packages:        map[string]*Package{},
 		testCases:       nil,
 		lastTestCase:    nil,
 		testCasesByName: map[string]*TestCase{},
@@ -142,16 +144,24 @@ func parse(
 				}
 			case tokenizer.ActionRun:
 				fallthrough
+			case tokenizer.ActionPass:
+				fallthrough
+			case tokenizer.ActionFail:
+				fallthrough
+			case tokenizer.ActionSkip:
+				fallthrough
 			case tokenizer.ActionCont:
 				lastTestCase := pkgTracker.GetLastTestCase()
-				if lastTestCase.Output == "" {
-					lastTestCase.Output = string(evt.Output)
-				} else {
-					lastTestCase.Output = fmt.Sprintf(
-						"%s\n%s",
-						lastTestCase.Output,
-						string(evt.Output),
-					)
+				if lastTestCase != nil && len(evt.Output) > 0 {
+					if lastTestCase.Output == "" {
+						lastTestCase.Output = string(evt.Output)
+					} else {
+						lastTestCase.Output = fmt.Sprintf(
+							"%s\n%s",
+							lastTestCase.Output,
+							string(evt.Output),
+						)
+					}
 				}
 			case tokenizer.ActionPackage:
 				lastPackage := pkgTracker.GetPackage()
@@ -164,6 +174,12 @@ func parse(
 						string(evt.Output),
 					)
 				}
+			case tokenizer.ActionFailFinal:
+				fallthrough
+			case tokenizer.ActionPassFinal:
+				fallthrough
+			case tokenizer.ActionSkipFinal:
+				pkgTracker.Write()
 			default:
 				if len(evt.Output) > 0 {
 					panic(fmt.Errorf("unexpected output after %s event: %s", lastAction, evt.Output))
@@ -194,28 +210,32 @@ func finish(evt tokenizer.Event, pkgTracker *packageTracker, result Result) {
 				Coverage: evt.Coverage,
 			},
 		)
-		pkgTracker.Write()
 	}
 }
 
 type packageTracker struct {
 	currentPackage  *Package
+	packages        map[string]*Package
 	testCases       []*TestCase
 	lastTestCase    *TestCase
 	testCasesByName map[string]*TestCase
 	target          chan<- *Package
+	packageList     []*Package
 }
 
 func (p *packageTracker) SetPackage(pkg *Package) {
 	if p.currentPackage == nil {
 		pkg.TestCases = p.testCases
 		p.currentPackage = pkg
+		if _, ok := p.packages[pkg.Name]; !ok {
+			p.packageList = append(p.packageList, pkg)
+			p.packages[pkg.Name] = pkg
+		}
+
 		p.testCases = nil
 		return
 	} else if p.currentPackage.Name != pkg.Name {
-		// Write the current package
-		p.Write()
-		p.currentPackage = nil
+		p.currentPackage = p.packages[pkg.Name]
 	}
 
 	if pkg.Result != "" {
@@ -260,10 +280,13 @@ func (p *packageTracker) Write() {
 			}
 		}
 		p.testCases = nil
-	} else {
-		p.target <- p.currentPackage
-		p.currentPackage = nil
 	}
+	for _, pkg := range p.packageList {
+		p.target <- pkg
+	}
+	p.packages = map[string]*Package{}
+	p.packageList = []*Package{}
+	p.currentPackage = nil
 	p.testCasesByName = map[string]*TestCase{}
 }
 

testdata/coverage-nostatements.tokenizer.json

@@ -8,7 +8,7 @@
     "test":   "TestNothing"
   },
   {
-    "action": "pass"
+    "action": "pass-final"
   },
   {
     "action": "coverage_nostatements"

testdata/coverage.tokenizer.json

@@ -8,7 +8,7 @@
     "test":   "TestNothing"
   },
   {
-    "action": "pass"
+    "action": "pass-final"
   },
   {
     "action": "coverage",

testdata/gotestfmt.parser.json

@@ -0,0 +1,63 @@
+{
+  "prefix": null,
+  "downloads": {
+    "packages": null,
+    "failed": false
+  },
+  "packages": [
+    {
+      "name": "github.com/haveyoudebuggedit/gotestfmt",
+      "result": "SKIP",
+      "duration": "0s",
+      "coverage": null,
+      "output": "",
+      "testcases": null,
+      "reason": "no test files"
+    },
+    {
+      "name": "github.com/haveyoudebuggedit/gotestfmt/cmd/gotestfmt",
+      "result": "SKIP",
+      "duration": "0s",
+      "coverage": null,
+      "output": "",
+      "testcases": null,
+      "reason": "no test files"
+    },
+    {
+      "name": "github.com/haveyoudebuggedit/gotestfmt/parser",
+      "result": "PASS",
+      "duration": "0s",
+      "coverage": null,
+      "output": "",
+      "testcases": null,
+      "reason": ""
+    },
+    {
+      "name": "github.com/haveyoudebuggedit/gotestfmt/renderer",
+      "result": "SKIP",
+      "duration": "0s",
+      "coverage": null,
+      "output": "",
+      "testcases": null,
+      "reason": "no test files"
+    },
+    {
+      "name": "github.com/haveyoudebuggedit/gotestfmt/testutil",
+      "result": "SKIP",
+      "duration": "0s",
+      "coverage": null,
+      "output": "",
+      "testcases": null,
+      "reason": "no test files"
+    },
+    {
+      "name": "github.com/haveyoudebuggedit/gotestfmt/tokenizer",
+      "result": "PASS",
+      "duration": "0s",
+      "coverage": null,
+      "output": "",
+      "testcases": null,
+      "reason": ""
+    }
+  ]
+}

testdata/gotestfmt.tokenizer.json

@@ -0,0 +1,72 @@
+[
+  {
+    "action": "skip",
+    "package": "github.com/haveyoudebuggedit/gotestfmt",
+    "version": "",
+    "test": "",
+    "elapsed": "0s",
+    "output": "bm8gdGVzdCBmaWxlcw==",
+    "cached": false,
+    "coverage": null
+  },
+  {
+    "action": "skip",
+    "package": "github.com/haveyoudebuggedit/gotestfmt/cmd/gotestfmt",
+    "version": "",
+    "test": "",
+    "elapsed": "0s",
+    "output": "bm8gdGVzdCBmaWxlcw==",
+    "cached": false,
+    "coverage": null
+  },
+  {
+    "action": "pass",
+    "package": "github.com/haveyoudebuggedit/gotestfmt/parser",
+    "version": "",
+    "test": "",
+    "elapsed": "0s",
+    "output": null,
+    "cached": true,
+    "coverage": null
+  },
+  {
+    "action": "skip",
+    "package": "github.com/haveyoudebuggedit/gotestfmt/renderer",
+    "version": "",
+    "test": "",
+    "elapsed": "0s",
+    "output": "bm8gdGVzdCBmaWxlcw==",
+    "cached": false,
+    "coverage": null
+  },
+  {
+    "action": "skip",
+    "package": "github.com/haveyoudebuggedit/gotestfmt/testutil",
+    "version": "",
+    "test": "",
+    "elapsed": "0s",
+    "output": "bm8gdGVzdCBmaWxlcw==",
+    "cached": false,
+    "coverage": null
+  },
+  {
+    "action": "pass",
+    "package": "github.com/haveyoudebuggedit/gotestfmt/tokenizer",
+    "version": "",
+    "test": "",
+    "elapsed": "0s",
+    "output": null,
+    "cached": true,
+    "coverage": null
+  },
+  {
+    "action": "stdout",
+    "package": "",
+    "version": "",
+    "test": "",
+    "elapsed": "0s",
+    "output": "",
+    "cached": false,
+    "coverage": null
+  }
+]

testdata/gotestfmt.txt

@@ -0,0 +1,6 @@
+?       github.com/haveyoudebuggedit/gotestfmt  [no test files]
+?       github.com/haveyoudebuggedit/gotestfmt/cmd/gotestfmt    [no test files]
+ok      github.com/haveyoudebuggedit/gotestfmt/parser   (cached)
+?       github.com/haveyoudebuggedit/gotestfmt/renderer [no test files]
+?       github.com/haveyoudebuggedit/gotestfmt/testutil [no test files]
+ok      github.com/haveyoudebuggedit/gotestfmt/tokenizer        (cached)

testdata/mod-download.tokenizer.json

@@ -28,7 +28,7 @@
     "test": "TestNothing"
   },
   {
-    "action": "pass"
+    "action": "pass-final"
   },
   {
     "action": "pass",

testdata/parallel.tokenizer.json

@@ -58,7 +58,7 @@
     "elapsed": "10.020s"
   },
   {
-    "action": "pass"
+    "action": "pass-final"
   },
   {
     "action": "pass",