Different diff: (+got -want)

frankban · Aug 4, 2023 · 6629340 · 6629340
1 parent 7c937a9
commit 6629340
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 30 deletions.
diff --git a/checker.go b/checker.go
@@ -94,8 +94,8 @@ func (c *equalsChecker) Check(got interface{}, args []interface{}, note func(key
 				return i != -1 && i < len(s)-1
 			}
 			if isMultiLine(got) || isMultiLine(want) {
-				diff := cmp.Diff(strings.SplitAfter(got, "\n"), strings.SplitAfter(want, "\n"))
-				note("line diff (-got +want)", Unquoted(diff))
+				diff := cmp.Diff(strings.SplitAfter(want, "\n"), strings.SplitAfter(got, "\n"))
+				note("line diff (+got -want)", Unquoted(diff))
 			}
 		}
 	}
@@ -135,10 +135,10 @@ func (c *cmpEqualsChecker) Check(got interface{}, args []interface{}, note func(
 		}
 	}()
 	want := args[0]
-	if diff := cmp.Diff(got, want, c.opts...); diff != "" {
+	if diff := cmp.Diff(want, got, c.opts...); diff != "" {
 		// Only output values when the verbose flag is set.
 		note("error", Unquoted("values are not deep equal"))
-		note("diff (-got +want)", Unquoted(diff))
+		note("diff (+got -want)", Unquoted(diff))
 		note("got", SuppressedIfLong{got})
 		note("want", SuppressedIfLong{want})
 		return ErrSilent

diff --git a/checker_test.go b/checker_test.go
@@ -131,7 +131,7 @@ want:
 	expectedCheckFailure: fmt.Sprintf(`
 error:
   values are not equal
-line diff (-got +want):
+line diff (+got -want):
 %s
 got:
   "a\nlong\nmultiline\nstring"
@@ -159,7 +159,7 @@ want:
 	expectedCheckFailure: fmt.Sprintf(`
 error:
   values are not equal
-line diff (-got +want):
+line diff (+got -want):
 %s
 got:
   "\nfoo"
@@ -415,7 +415,7 @@ want:
 	expectedCheckFailure: fmt.Sprintf(`
 error:
   values are not deep equal
-diff (-got +want):
+diff (+got -want):
 %s
 got:
   struct { Strings []interface {}; Ints []int }{
@@ -442,7 +442,7 @@ want:
 	expectedCheckFailure: fmt.Sprintf(`
 error:
   values are not deep equal
-diff (-got +want):
+diff (+got -want):
 %s
 got:
   <suppressed due to length (11 lines), use -v for full output>
@@ -467,7 +467,7 @@ want:
 	expectedCheckFailure: fmt.Sprintf(`
 error:
   values are not deep equal
-diff (-got +want):
+diff (+got -want):
 %s
 got:
   []interface {}{
@@ -501,7 +501,7 @@ want:
 	expectedCheckFailure: fmt.Sprintf(`
 error:
   values are not deep equal
-diff (-got +want):
+diff (+got -want):
 %s
 got:
   <suppressed due to length (11 lines), use -v for full output>
@@ -533,7 +533,7 @@ want:
 	expectedCheckFailure: fmt.Sprintf(`
 error:
   values are not deep equal
-diff (-got +want):
+diff (+got -want):
 %s
 got:
   []int{1, 2, 4}
@@ -608,7 +608,7 @@ want:
 	expectedCheckFailure: fmt.Sprintf(`
 error:
   values are not deep equal
-diff (-got +want):
+diff (+got -want):
 %s
 got:
   s"2012-03-29 00:00:00 +0000 UTC"
@@ -665,7 +665,7 @@ want args:
 	expectedCheckFailure: fmt.Sprintf(`
 error:
   values are not deep equal
-diff (-got +want):
+diff (+got -want):
 %s
 got:
   struct { Strings []interface {}; Ints []int }{
@@ -692,7 +692,7 @@ want:
 	expectedCheckFailure: fmt.Sprintf(`
 error:
   values are not deep equal
-diff (-got +want):
+diff (+got -want):
 %s
 got:
   <suppressed due to length (15 lines), use -v for full output>
@@ -708,7 +708,7 @@ want:
 	expectedCheckFailure: fmt.Sprintf(`
 error:
   values are not deep equal
-diff (-got +want):
+diff (+got -want):
 %s
 got:
   []interface {}{
@@ -878,7 +878,7 @@ want:
 	expectedCheckFailure: fmt.Sprintf(`
 error:
   values are not deep equal
-diff (-got +want):
+diff (+got -want):
 %s
 got:
   []string{"bad", "wolf"}
@@ -2721,7 +2721,7 @@ error:
   mismatch at index 1
 error:
   values are not deep equal
-diff (-got +want):
+diff (+got -want):
 %s
 got:
   []string{"a", "c"}
@@ -2947,7 +2947,7 @@ want:
 	expectedCheckFailure: fmt.Sprintf(`
 error:
   values are not deep equal
-diff (-got +want):
+diff (+got -want):
 %s
 got:
   map[string]interface {}{
@@ -3085,8 +3085,8 @@ func TestCheckers(t *testing.T) {
 	}
 }
 
-func diff(x, y interface{}, opts ...cmp.Option) string {
-	d := cmp.Diff(x, y, opts...)
+func diff(got, want interface{}, opts ...cmp.Option) string {
+	d := cmp.Diff(want, got, opts...)
 	return strings.TrimSuffix(qt.Prefixf("  ", "%s", d), "\n")
 }
 

diff --git a/report_test.go b/report_test.go
@@ -95,25 +95,25 @@ func TestCmpReportOutput(t *testing.T) {
 		AnInt: 42,
 	}, {
 		AnInt: 47,
-	}, {
-		AnInt: 1,
 	}, {
 		AnInt: 2,
-	}}
+	}, {
+		AnInt: 1,
+	}, {}}
 	wantExamples := []*reportExample{{
 		AnInt: 42,
 	}, {
 		AnInt: 47,
-	}, {
-		AnInt: 2,
 	}, {
 		AnInt: 1,
-	}, {}}
+	}, {
+		AnInt: 2,
+	}}
 	c.Assert(gotExamples, qt.DeepEquals, wantExamples)
 	want := `
 error:
   values are not deep equal
-diff (-got +want):
+diff (+got -want):
     []*quicktest_test.reportExample{
             &{AnInt: 42},
             &{AnInt: 47},
@@ -126,16 +126,16 @@ got:
   []*quicktest_test.reportExample{
       &quicktest_test.reportExample{AnInt:42},
       &quicktest_test.reportExample{AnInt:47},
-      &quicktest_test.reportExample{AnInt:1},
       &quicktest_test.reportExample{AnInt:2},
+      &quicktest_test.reportExample{AnInt:1},
+      &quicktest_test.reportExample{},
   }
 want:
   []*quicktest_test.reportExample{
       &quicktest_test.reportExample{AnInt:42},
       &quicktest_test.reportExample{AnInt:47},
-      &quicktest_test.reportExample{AnInt:2},
       &quicktest_test.reportExample{AnInt:1},
-      &quicktest_test.reportExample{},
+      &quicktest_test.reportExample{AnInt:2},
   }
 stack:
   $file:112