gtr: Handle coverage events

go-junit-report_test.go

@@ -9,6 +9,7 @@ import (
 	"os"
 	"regexp"
 	"runtime"
+	"strconv"
 	"strings"
 	"testing"
 	"time"
@@ -1618,7 +1619,12 @@ func testNewParser(input, reportFile, packageName string, t *testing.T) {
 func modifyForBackwardsCompat(testsuites junit.Testsuites) junit.Testsuites {
 	testsuites.XMLName.Local = ""
 	for i, suite := range testsuites.Suites {
+		if covIdx, covProp := getProperty("coverage.statements.pct", suite.Properties); covIdx > -1 {
+			pct, _ := strconv.ParseFloat(covProp.Value, 64)
+			testsuites.Suites[i].Properties[covIdx].Value = fmt.Sprintf("%.2f", pct)
+		}
 		testsuites.Suites[i].Properties = dropProperty("go.version", suite.Properties)
+
 		for j := range suite.Testcases {
 			testsuites.Suites[i].Testcases[j].Classname = suite.Name
 		}
@@ -1636,6 +1642,15 @@ func dropProperty(name string, properties []junit.Property) []junit.Property {
 	return props
 }
 
+func getProperty(name string, properties []junit.Property) (int, junit.Property) {
+	for i, prop := range properties {
+		if prop.Name == name {
+			return i, prop
+		}
+	}
+	return -1, junit.Property{}
+}
+
 func toXML(testsuites junit.Testsuites) (string, error) {
 	var buf bytes.Buffer
 

pkg/gtr/builder.go

@@ -12,9 +12,10 @@ type ReportBuilder struct {
 	benchmarks map[int]Benchmark
 
 	// state
-	nextId int // next free id
+	nextId   int // next free id
-	lastId int // last test id // TODO: stack?
+	lastId   int // last test id // TODO: stack?
-	output []string
+	output   []string
+	coverage float64
 
 	// defaults
 	packageName string
@@ -91,16 +92,22 @@ func (b *ReportBuilder) CreatePackage(name string, duration time.Duration) {
 	b.packages = append(b.packages, Package{
 		Name:       name,
 		Duration:   duration,
+		Coverage:   b.coverage,
+		Output:     b.output,
 		Tests:      tests,
 		Benchmarks: benchmarks,
-		Output:     b.output,
 	})
 
-	b.tests = make(map[int]Test)
-	b.benchmarks = make(map[int]Benchmark)
-	b.output = nil
 	b.nextId = 1
 	b.lastId = 0
+	b.output = nil
+	b.coverage = 0
+	b.tests = make(map[int]Test)
+	b.benchmarks = make(map[int]Benchmark)
+}
+
+func (b *ReportBuilder) Coverage(pct float64, packages []string) {
+	b.coverage = pct
 }
 
 func (b *ReportBuilder) AppendOutput(line string) {

pkg/gtr/gtr.go

@@ -73,6 +73,8 @@ func FromEvents(events []Event, packageName string) Report {
 		case "status": // ignore for now
 		case "summary":
 			report.CreatePackage(ev.Name, ev.Duration)
+		case "coverage":
+			report.Coverage(ev.CovPct, ev.CovPackages)
 		case "output":
 			report.AppendOutput(ev.Data)
 		default:
@@ -91,6 +93,10 @@ func JUnit(report Report) junit.Testsuites {
 			Time: junit.FormatDuration(pkg.Duration),
 		}
 
+		if pkg.Coverage > 0 {
+			suite.AddProperty("coverage.statements.pct", fmt.Sprintf("%.2f", pkg.Coverage))
+		}
+
 		for _, line := range pkg.Output {
 			if fields := strings.FieldsFunc(line, propFieldsFunc); len(fields) == 2 && propPrefixes[fields[0]] {
 				suite.AddProperty(fields[0], fields[1])

testdata/10-report.xml

@@ -3,7 +3,7 @@
 	<testsuite tests="2" failures="0" time="0.400" name="package1/foo">
 		<properties>
 			<property name="go.version" value="1.0"></property>
-			<property name="coverage.statements.pct" value="10.0"></property>
+			<property name="coverage.statements.pct" value="10.00"></property>
 		</properties>
 		<testcase classname="foo" name="TestA" time="0.100"></testcase>
 		<testcase classname="foo" name="TestB" time="0.300"></testcase>
@@ -11,7 +11,7 @@
 	<testsuite tests="1" failures="0" time="4.200" name="package2/bar">
 		<properties>
 			<property name="go.version" value="1.0"></property>
-			<property name="coverage.statements.pct" value="99.8"></property>
+			<property name="coverage.statements.pct" value="99.80"></property>
 		</properties>
 		<testcase classname="bar" name="TestC" time="4.200"></testcase>
 	</testsuite>

testdata/18-report.xml

@@ -3,7 +3,7 @@
 	<testsuite tests="2" failures="0" time="0.400" name="package1/foo">
 		<properties>
 			<property name="go.version" value="1.0"></property>
-			<property name="coverage.statements.pct" value="10.0"></property>
+			<property name="coverage.statements.pct" value="10.00"></property>
 		</properties>
 		<testcase classname="foo" name="TestA" time="0.100"></testcase>
 		<testcase classname="foo" name="TestB" time="0.300"></testcase>
@@ -11,7 +11,7 @@
 	<testsuite tests="1" failures="0" time="4.200" name="package2/bar">
 		<properties>
 			<property name="go.version" value="1.0"></property>
-			<property name="coverage.statements.pct" value="99.8"></property>
+			<property name="coverage.statements.pct" value="99.80"></property>
 		</properties>
 		<testcase classname="bar" name="TestC" time="4.200"></testcase>
 	</testsuite>