nhyatt/go-junit-report
1
0
Fork 0
mirror of https://github.com/jstemmer/go-junit-report.git synced 2025-04-05 13:08:07 -05:00
Code Issues Projects Releases Wiki Activity

Fix cmp.Diff argument order in tests

Browse Source
This commit is contained in:
Joël Stemmer 2022-05-07 12:59:39 +01:00
parent 7c195be87f
commit df7394c77c
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/gojunitreport/go-junit-report_test.go
View File

@ -79,7 +79,7 @@ func testRun(inputFile, reportFile string, config Config, t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
if diff := cmp.Diff(output.String(), string(wantReport)); diff != "" { if diff := cmp.Diff(string(wantReport), output.String()); diff != "" {
t.Errorf("Unexpected report diff (-want, +got):\n%v", diff) t.Errorf("Unexpected report diff (-want, +got):\n%v", diff)
} }
} }

16
junit/junit_test.go
View File

@ -44,13 +44,13 @@ func TestCreateFromReport(t *testing.T) {
} }
got := CreateFromReport(report, "") got := CreateFromReport(report, "")
if diff := cmp.Diff(got, want); diff != "" { if diff := cmp.Diff(want, got); diff != "" {
t.Errorf("CreateFromReport incorrect, diff (-want, +got):\n%s\n", diff) t.Errorf("CreateFromReport incorrect, diff (-want, +got):\n%s\n", diff)
} }
} }
func TestMarshalUnmarshal(t *testing.T) { func TestMarshalUnmarshal(t *testing.T) {
suites := Testsuites{ want := Testsuites{
Name: "name", Name: "name",
Time: "12.345", Time: "12.345",
Tests: 1, Tests: 1,
@ -89,18 +89,18 @@ func TestMarshalUnmarshal(t *testing.T) {
}, },
} }
data, err := xml.MarshalIndent(suites, "", "\t") data, err := xml.MarshalIndent(want, "", "\t")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
var unmarshaled Testsuites var got Testsuites
if err := xml.Unmarshal(data, &unmarshaled); err != nil { if err := xml.Unmarshal(data, &got); err != nil {
t.Fatal(err) t.Fatal(err)
} }
suites.XMLName.Local = "testsuites" want.XMLName.Local = "testsuites"
if diff := cmp.Diff(suites, unmarshaled); diff != "" { if diff := cmp.Diff(want, got); diff != "" {
t.Errorf("Unmarshal result incorrect, diff (-want +got):\n%s\n", diff) t.Errorf("Unmarshal result incorrect, diff (-want +got):\n%s\n", diff)
} }
} }
@ -152,7 +152,7 @@ func TestGroupBenchmarksByName(t *testing.T) {
for _, test := range tests { for _, test := range tests {
got := groupBenchmarksByName(test.in) got := groupBenchmarksByName(test.in)
if diff := cmp.Diff(got, test.want); diff != "" { if diff := cmp.Diff(test.want, got); diff != "" {
t.Errorf("groupBenchmarksByName result incorrect, diff (-want, +got):\n%s\n", diff) t.Errorf("groupBenchmarksByName result incorrect, diff (-want, +got):\n%s\n", diff)
} }
} }

8
parser/gotest/gotest_test.go
View File

@ -208,7 +208,7 @@ func TestParseLine(t *testing.T) {
parser := NewParser() parser := NewParser()
parser.parseLine(test.input) parser.parseLine(test.input)
got := parser.events got := parser.events
if diff := cmp.Diff(got, want); diff != "" { if diff := cmp.Diff(want, got); diff != "" {
t.Errorf("parseLine(%q) returned unexpected events, diff (-want, +got):\n%v", test.input, diff) t.Errorf("parseLine(%q) returned unexpected events, diff (-want, +got):\n%v", test.input, diff)
} }
}) })
@ -242,7 +242,7 @@ func TestReport(t *testing.T) {
{Type: "output", Data: "error message"}, {Type: "output", Data: "error message"},
{Type: "summary", Result: "FAIL", Name: "package/failing1", Data: "[build failed]"}, {Type: "summary", Result: "FAIL", Name: "package/failing1", Data: "[build failed]"},
} }
expected := gtr.Report{ want := gtr.Report{
Packages: []gtr.Package{ Packages: []gtr.Package{
{ {
Name: "package/name", Name: "package/name",
@ -309,8 +309,8 @@ func TestReport(t *testing.T) {
} }
parser := NewParser(TimestampFunc(func() time.Time { return testTimestamp })) parser := NewParser(TimestampFunc(func() time.Time { return testTimestamp }))
actual := parser.report(events) got := parser.report(events)
if diff := cmp.Diff(actual, expected); diff != "" { if diff := cmp.Diff(want, got); diff != "" {
t.Errorf("FromEvents report incorrect, diff (-want, +got):\n%v", diff) t.Errorf("FromEvents report incorrect, diff (-want, +got):\n%v", diff)
} }
} }

5
parser/gotest/json_test.go
View File

@ -24,7 +24,7 @@ func TestJSONReaderReadAll(t *testing.T) {
=== RUN TestOK === RUN TestOK
` `
if diff := cmp.Diff(string(got), want); diff != "" { if diff := cmp.Diff(want, string(got)); diff != "" {
t.Errorf("unexpected result from jsonReader, diff (-want, +got):\n%s\n", diff) t.Errorf("unexpected result from jsonReader, diff (-want, +got):\n%s\n", diff)
} }
} }
@ -51,7 +51,8 @@ func TestJSONReaderReadSmallBuffer(t *testing.T) {
t.Fatalf("Read error: %v", err) t.Fatalf("Read error: %v", err)
} }
if diff := cmp.Diff(string(buf[:n]), string(want)); diff != "" { got := buf[:n]
if diff := cmp.Diff(string(want), string(got)); diff != "" {
t.Fatalf("unexpected result from jsonReader, diff (-want, +got):\n%s\n", diff) t.Fatalf("unexpected result from jsonReader, diff (-want, +got):\n%s\n", diff)
} }
} }