Merge pull request #143 from greg-dennis/master

Report stores a slice of Property structs instead of a map

gtr/gtr.go

@@ -61,7 +61,7 @@ type Package struct {
 	Duration   time.Duration
 	Coverage   float64
 	Output     []string
-	Properties map[string]string
+	Properties []Property
 
 	Tests []Test
 
@@ -73,10 +73,28 @@ type Package struct {
 // property with the given key already exists, its old value will be
 // overwritten with the given value.
 func (p *Package) SetProperty(key, value string) {
-	if p.Properties == nil {
+	// TODO(jstemmer): Delete this method in the next major release.
-		p.Properties = make(map[string]string)
+	// Delete all the properties whose name is the specified key,
+	// then add the specieid key-value property.
+	i := 0
+	for _, prop := range p.Properties {
+		if key != prop.Name {
+			p.Properties[i] = prop
+			i++
+		}
 	}
-	p.Properties[key] = value
+	p.Properties = p.Properties[:i]
+	p.AddProperty(key, value)
+}
+
+// AddProperty appends a name/value property in the current package.
+func (p *Package) AddProperty(name, value string) {
+	p.Properties = append(p.Properties, Property{Name: name, Value: value})
+}
+
+// Property is a name/value property.
+type Property struct {
+	Name, Value string
 }
 
 // Test contains the results of a single test.

gtr/gtr_test.go

@@ -1,6 +1,10 @@
 package gtr
 
-import "testing"
+import (
+	"testing"
+
+	"github.com/google/go-cmp/cmp"
+)
 
 func TestTrimPrefixSpaces(t *testing.T) {
 	tests := []struct {
@@ -24,3 +28,15 @@ func TestTrimPrefixSpaces(t *testing.T) {
 		}
 	}
 }
+
+func TestSetProperty(t *testing.T) {
+	pkg := Package{}
+	pkg.SetProperty("a", "b")
+	pkg.SetProperty("c", "d")
+	pkg.SetProperty("a", "e")
+
+	want := []Property{{Name: "c", Value: "d"}, {Name: "a", Value: "e"}}
+	if diff := cmp.Diff(want, pkg.Properties); diff != "" {
+		t.Errorf("SetProperty got unexpected diff: %s", diff)
+	}
+}

junit/junit.go

@@ -144,8 +144,8 @@ func CreateFromReport(report gtr.Report, hostname string) Testsuites {
 			suite.SetTimestamp(pkg.Timestamp)
 		}
 
-		for k, v := range pkg.Properties {
+		for _, p := range pkg.Properties {
-			suite.AddProperty(k, v)
+			suite.AddProperty(p.Name, p.Value)
 		}
 
 		if len(pkg.Output) > 0 {

junit/junit_test.go

@@ -19,7 +19,7 @@ func TestCreateFromReport(t *testing.T) {
 				Duration:   1 * time.Second,
 				Coverage:   0.9,
 				Output:     []string{"output"},
-				Properties: map[string]string{"go.version": "go1.18"},
+				Properties: []gtr.Property{{Name: "go.version", Value: "go1.18"}},
 				Tests: []gtr.Test{
 					{
 						Name:   "TestPass",