junit: Don't lose benchmark results when converting to junit testsuites

pkg/junit/junit.go

@@ -194,6 +194,10 @@ func CreateFromReport(report gtr.Report, hostname string) Testsuites {
 				tc.Failure = &Result{
 					Message: "Failed",
 				}
+			} else if bm.Result == gtr.Skip {
+				tc.Skipped = &Result{
+					Message: "Skipped",
+				}
 			}
 
 			suite.AddTestcase(tc)
@@ -279,6 +283,7 @@ func groupBenchmarksByName(benchmarks []gtr.Benchmark) []gtr.Benchmark {
 			bm.AllocsPerOp += b.AllocsPerOp
 		}
 		n := len(benchmap[bm.Name])
+		grouped[i] = benchmap[bm.Name][0]
 		grouped[i].NsPerOp = bm.NsPerOp / float64(n)
 		grouped[i].MBPerSec = bm.MBPerSec / float64(n)
 		grouped[i].BytesPerOp = bm.BytesPerOp / int64(n)

pkg/junit/junit_test.go

@@ -4,9 +4,51 @@ import (
 	"encoding/xml"
 	"testing"
 
+	"github.com/jstemmer/go-junit-report/v2/pkg/gtr"
+
 	"github.com/google/go-cmp/cmp"
 )
 
+func TestCreateFromReport(t *testing.T) {
+	// TODO: complete this report
+	report := gtr.Report{
+		Packages: []gtr.Package{
+			{
+				Benchmarks: []gtr.Benchmark{
+					{
+						Name:   "BenchmarkFail",
+						Result: gtr.Fail,
+					},
+				},
+			},
+		},
+	}
+
+	want := Testsuites{
+		Tests:    1,
+		Failures: 1,
+		Suites: []Testsuite{
+			{
+				Tests:    1,
+				Failures: 1,
+				Time:     "0.000",
+				Testcases: []Testcase{
+					{
+						Name:    "BenchmarkFail",
+						Time:    "0.000000000",
+						Failure: &Result{Message: "Failed"},
+					},
+				},
+			},
+		},
+	}
+
+	got := CreateFromReport(report, "")
+	if diff := cmp.Diff(got, want); diff != "" {
+		t.Errorf("CreateFromReport incorrect, diff (-want, +got):\n%s\n", diff)
+	}
+}
+
 func TestMarshalUnmarshal(t *testing.T) {
 	suites := Testsuites{
 		Name:     "name",