Address review nit, use longer variable identifiers.

This commit is contained in:
Ben Luddy 2024-02-27 16:12:39 -05:00
parent 12217672a3
commit 374e4b5686
No known key found for this signature in database
GPG Key ID: A6551E73A5974C30
2 changed files with 17 additions and 17 deletions

View File

@ -105,13 +105,13 @@ func TestDecode(t *testing.T) {
assertOnError: assertNilError, assertOnError: assertNilError,
}, },
} { } {
ms := tc.modes decModes := tc.modes
if len(ms) == 0 { if len(decModes) == 0 {
ms = allDecModes decModes = allDecModes
} }
for _, dm := range ms { for _, decMode := range decModes {
modeName, ok := decModeNames[dm] modeName, ok := decModeNames[decMode]
if !ok { if !ok {
t.Fatal("test case configured to run against unrecognized mode") t.Fatal("test case configured to run against unrecognized mode")
} }
@ -124,7 +124,7 @@ func TestDecode(t *testing.T) {
} else { } else {
dst = reflect.New(reflect.TypeOf(tc.into)) dst = reflect.New(reflect.TypeOf(tc.into))
} }
err := dm.Unmarshal(tc.in, dst.Interface()) err := decMode.Unmarshal(tc.in, dst.Interface())
tc.assertOnError(t, err) tc.assertOnError(t, err)
if tc.want != nil { if tc.want != nil {
if diff := cmp.Diff(tc.want, dst.Elem().Interface()); diff != "" { if diff := cmp.Diff(tc.want, dst.Elem().Interface()); diff != "" {

View File

@ -260,24 +260,24 @@ func TestRoundtrip(t *testing.T) {
}{}, }{},
}, },
} { } {
mps := tc.modePairs modePairs := tc.modePairs
if len(mps) == 0 { if len(modePairs) == 0 {
// Default is all modes to all modes. // Default is all modes to all modes.
mps = []modePair{} modePairs = []modePair{}
for _, em := range allEncModes { for _, encMode := range allEncModes {
for _, dm := range allDecModes { for _, decMode := range allDecModes {
mps = append(mps, modePair{enc: em, dec: dm}) modePairs = append(modePairs, modePair{enc: encMode, dec: decMode})
} }
} }
} }
for _, mp := range mps { for _, modePair := range modePairs {
encModeName, ok := encModeNames[mp.enc] encModeName, ok := encModeNames[modePair.enc]
if !ok { if !ok {
t.Fatal("test case configured to run against unrecognized encode mode") t.Fatal("test case configured to run against unrecognized encode mode")
} }
decModeName, ok := decModeNames[mp.dec] decModeName, ok := decModeNames[modePair.dec]
if !ok { if !ok {
t.Fatal("test case configured to run against unrecognized decode mode") t.Fatal("test case configured to run against unrecognized decode mode")
} }
@ -285,13 +285,13 @@ func TestRoundtrip(t *testing.T) {
t.Run(fmt.Sprintf("enc=%s/dec=%s/%s", encModeName, decModeName, tc.name), func(t *testing.T) { t.Run(fmt.Sprintf("enc=%s/dec=%s/%s", encModeName, decModeName, tc.name), func(t *testing.T) {
original := tc.obj original := tc.obj
b, err := mp.enc.Marshal(original) b, err := modePair.enc.Marshal(original)
if err != nil { if err != nil {
t.Fatalf("unexpected error from Marshal: %v", err) t.Fatalf("unexpected error from Marshal: %v", err)
} }
final := reflect.New(reflect.TypeOf(original)) final := reflect.New(reflect.TypeOf(original))
err = mp.dec.Unmarshal(b, final.Interface()) err = modePair.dec.Unmarshal(b, final.Interface())
if err != nil { if err != nil {
t.Fatalf("unexpected error from Unmarshal: %v", err) t.Fatalf("unexpected error from Unmarshal: %v", err)
} }