From df7394c77c5cc072d170a74ba7b59e576a11a2d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=ABl=20Stemmer?= <stemmertech@gmail.com>
Date: Sat, 7 May 2022 12:59:39 +0100
Subject: [PATCH] Fix cmp.Diff argument order in tests

---
 internal/gojunitreport/go-junit-report_test.go |  2 +-
 junit/junit_test.go                            | 16 ++++++++--------
 parser/gotest/gotest_test.go                   |  8 ++++----
 parser/gotest/json_test.go                     |  5 +++--
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/internal/gojunitreport/go-junit-report_test.go b/internal/gojunitreport/go-junit-report_test.go
index 606b703..97db517 100644
--- a/internal/gojunitreport/go-junit-report_test.go
+++ b/internal/gojunitreport/go-junit-report_test.go
@@ -79,7 +79,7 @@ func testRun(inputFile, reportFile string, config Config, t *testing.T) {
 		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)
 	}
 }
diff --git a/junit/junit_test.go b/junit/junit_test.go
index a5861f9..5516938 100644
--- a/junit/junit_test.go
+++ b/junit/junit_test.go
@@ -44,13 +44,13 @@ func TestCreateFromReport(t *testing.T) {
 	}
 
 	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)
 	}
 }
 
 func TestMarshalUnmarshal(t *testing.T) {
-	suites := Testsuites{
+	want := Testsuites{
 		Name:     "name",
 		Time:     "12.345",
 		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 {
 		t.Fatal(err)
 	}
 
-	var unmarshaled Testsuites
-	if err := xml.Unmarshal(data, &unmarshaled); err != nil {
+	var got Testsuites
+	if err := xml.Unmarshal(data, &got); err != nil {
 		t.Fatal(err)
 	}
 
-	suites.XMLName.Local = "testsuites"
-	if diff := cmp.Diff(suites, unmarshaled); diff != "" {
+	want.XMLName.Local = "testsuites"
+	if diff := cmp.Diff(want, got); 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 {
 		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)
 		}
 	}
diff --git a/parser/gotest/gotest_test.go b/parser/gotest/gotest_test.go
index ce83e62..09feb09 100644
--- a/parser/gotest/gotest_test.go
+++ b/parser/gotest/gotest_test.go
@@ -208,7 +208,7 @@ func TestParseLine(t *testing.T) {
 			parser := NewParser()
 			parser.parseLine(test.input)
 			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)
 			}
 		})
@@ -242,7 +242,7 @@ func TestReport(t *testing.T) {
 		{Type: "output", Data: "error message"},
 		{Type: "summary", Result: "FAIL", Name: "package/failing1", Data: "[build failed]"},
 	}
-	expected := gtr.Report{
+	want := gtr.Report{
 		Packages: []gtr.Package{
 			{
 				Name:      "package/name",
@@ -309,8 +309,8 @@ func TestReport(t *testing.T) {
 	}
 
 	parser := NewParser(TimestampFunc(func() time.Time { return testTimestamp }))
-	actual := parser.report(events)
-	if diff := cmp.Diff(actual, expected); diff != "" {
+	got := parser.report(events)
+	if diff := cmp.Diff(want, got); diff != "" {
 		t.Errorf("FromEvents report incorrect, diff (-want, +got):\n%v", diff)
 	}
 }
diff --git a/parser/gotest/json_test.go b/parser/gotest/json_test.go
index 915a2bd..abe1af8 100644
--- a/parser/gotest/json_test.go
+++ b/parser/gotest/json_test.go
@@ -24,7 +24,7 @@ func TestJSONReaderReadAll(t *testing.T) {
 === 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)
 	}
 }
@@ -51,7 +51,8 @@ func TestJSONReaderReadSmallBuffer(t *testing.T) {
 			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)
 		}
 	}