From bdaa9a96263e3c4f07c9516869275b4a376fabaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=ABl=20Stemmer?= <stemmertech@gmail.com>
Date: Sat, 28 Apr 2018 19:38:05 +0100
Subject: [PATCH] gtr: Append output to tests

---
 pkg/gtr/gtr.go      | 28 ++++++++++++++++++++++++++--
 pkg/gtr/gtr_test.go | 19 +++++++++++++++++++
 2 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/pkg/gtr/gtr.go b/pkg/gtr/gtr.go
index be22a01..a16d3b4 100644
--- a/pkg/gtr/gtr.go
+++ b/pkg/gtr/gtr.go
@@ -41,6 +41,7 @@ type Package struct {
 	Name     string
 	Duration time.Duration
 	Coverage float64
+	Output   []string
 
 	Tests []Test
 }
@@ -60,10 +61,12 @@ func FromEvents(events []gotest.Event) Report {
 		case "run_test":
 			report.CreateTest(ev.Id, ev.Name)
 		case "end_test":
-			report.UpdateTest(ev.Id, ev.Result, ev.Duration)
+			report.EndTest(ev.Id, ev.Result, ev.Duration)
 		case "status": // ignore for now
 		case "summary":
 			report.CreatePackage(ev.Name, ev.Duration)
+		case "output":
+			report.AppendOutput(ev.Data)
 		default:
 			fmt.Printf("unhandled event type: %v\n", ev.Type)
 		}
@@ -76,6 +79,10 @@ type ReportBuilder struct {
 	packages []Package
 	ids      []int
 	tests    map[int]Test
+
+	// state
+	output []string
+	last   int // last test id // TODO: stack?
 }
 
 func NewReportBuilder() *ReportBuilder {
@@ -98,13 +105,17 @@ func (b *ReportBuilder) Build() Report {
 func (b *ReportBuilder) CreateTest(id int, name string) {
 	b.ids = append(b.ids, id)
 	b.tests[id] = Test{Name: name}
+
+	b.last = id
 }
 
-func (b *ReportBuilder) UpdateTest(id int, result string, duration time.Duration) {
+func (b *ReportBuilder) EndTest(id int, result string, duration time.Duration) {
 	t := b.tests[id]
 	t.Result = parseResult(result)
 	t.Duration = duration
 	b.tests[id] = t
+
+	b.last = id
 }
 
 func (b *ReportBuilder) CreatePackage(name string, duration time.Duration) {
@@ -116,9 +127,22 @@ func (b *ReportBuilder) CreatePackage(name string, duration time.Duration) {
 		Name:     name,
 		Duration: duration,
 		Tests:    tests,
+		Output:   b.output,
 	})
+
 	b.ids = nil
 	b.tests = make(map[int]Test)
+	b.output = nil
+}
+
+func (b *ReportBuilder) AppendOutput(line string) {
+	if b.last <= 0 {
+		b.output = append(b.output, line)
+		return
+	}
+	t := b.tests[b.last]
+	t.Output = append(t.Output, line)
+	b.tests[b.last] = t
 }
 
 func parseResult(r string) Result {
diff --git a/pkg/gtr/gtr_test.go b/pkg/gtr/gtr_test.go
index 8acb243..ca637f6 100644
--- a/pkg/gtr/gtr_test.go
+++ b/pkg/gtr/gtr_test.go
@@ -15,6 +15,11 @@ func TestFromEvents(t *testing.T) {
 		{Type: "end_test", Id: 1, Name: "TestOne", Result: "PASS", Duration: 1 * time.Millisecond},
 		{Type: "status", Result: "PASS"},
 		{Type: "summary", Result: "ok", Name: "package/name", Duration: 1 * time.Millisecond},
+		{Type: "run_test", Id: 2, Name: "TestOne"},
+		{Type: "output", Data: "\tfile_test.go:10: error"},
+		{Type: "end_test", Id: 2, Name: "TestOne", Result: "FAIL", Duration: 1 * time.Millisecond},
+		{Type: "status", Result: "FAIL"},
+		{Type: "summary", Result: "FAIL", Name: "package/name2", Duration: 1 * time.Millisecond},
 	}
 	expected := Report{
 		Packages: []Package{
@@ -29,6 +34,20 @@ func TestFromEvents(t *testing.T) {
 					},
 				},
 			},
+			{
+				Name:     "package/name2",
+				Duration: 1 * time.Millisecond,
+				Tests: []Test{
+					{
+						Name:     "TestOne",
+						Duration: 1 * time.Millisecond,
+						Result:   FAIL,
+						Output: []string{
+							"\tfile_test.go:10: error",
+						},
+					},
+				},
+			},
 		},
 	}