Skip to content

Commit f7e6b9c

Browse files
committed
all: switch go-cmp want and got
Signed-off-by: Koichi Shiraishi <[email protected]>
1 parent dd79aeb commit f7e6b9c

13 files changed

+826
-826
lines changed

base_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ func testCancelParams(t *testing.T, marshal marshalFunc, unmarshal unmarshalFunc
4747
t.Fatal(err)
4848
}
4949

50-
if diff := cmp.Diff(string(got), tt.want); (diff != "") != tt.wantErr {
51-
t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
50+
if diff := cmp.Diff(tt.want, string(got)); (diff != "") != tt.wantErr {
51+
t.Errorf("%s: wantErr: %t\n(-want +got)\n%s", tt.name, tt.wantErr, diff)
5252
}
5353
})
5454
}
@@ -83,8 +83,8 @@ func testCancelParams(t *testing.T, marshal marshalFunc, unmarshal unmarshalFunc
8383
t.Fatal(err)
8484
}
8585

86-
if diff := cmp.Diff(got, tt.want); (diff != "") != tt.wantErr {
87-
t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
86+
if diff := cmp.Diff(tt.want, got); (diff != "") != tt.wantErr {
87+
t.Errorf("%s: wantErr: %t\n(-want +got)\n%s", tt.name, tt.wantErr, diff)
8888
}
8989
})
9090
}
@@ -130,8 +130,8 @@ func testProgressParams(t *testing.T, marshal marshalFunc, unmarshal unmarshalFu
130130
t.Fatal(err)
131131
}
132132

133-
if diff := cmp.Diff(string(got), tt.want); (diff != "") != tt.wantErr {
134-
t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
133+
if diff := cmp.Diff(tt.want, string(got)); (diff != "") != tt.wantErr {
134+
t.Errorf("%s: wantErr: %t\n(-want +got)\n%s", tt.name, tt.wantErr, diff)
135135
}
136136
})
137137
}
@@ -166,13 +166,13 @@ func testProgressParams(t *testing.T, marshal marshalFunc, unmarshal unmarshalFu
166166
t.Fatal(err)
167167
}
168168

169-
if diff := cmp.Diff(got, tt.want, cmpopts.IgnoreFields(ProgressParams{}, "Token")); (diff != "") != tt.wantErr {
170-
t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
169+
if diff := cmp.Diff(tt.want, got, cmpopts.IgnoreFields(ProgressParams{}, "Token")); (diff != "") != tt.wantErr {
170+
t.Errorf("%s: wantErr: %t\n(-want +got)\n%s", tt.name, tt.wantErr, diff)
171171
}
172172

173173
if token := got.Token; !reflect.ValueOf(token).IsZero() {
174174
if diff := cmp.Diff(fmt.Sprint(token), wantWorkDoneToken); (diff != "") != tt.wantErr {
175-
t.Errorf("%s: wantErr: %t\n(-got, +want)\n%s", tt.name, tt.wantErr, diff)
175+
t.Errorf("%s: wantErr: %t\n(-want +got)\n%s", tt.name, tt.wantErr, diff)
176176
}
177177
}
178178
})

0 commit comments

Comments
 (0)