Skip to content

Commit d8ec1ca

Browse files
theorytheory
committed
Always create testify objects with current t
Otherwise failing tests show the wrong test name!
1 parent 48554e0 commit d8ec1ca

File tree

12 files changed

+146
-99
lines changed

12 files changed

+146
-99
lines changed

‎parser/lex_test.go‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212

1313
func TestScanString(t *testing.T) {
1414
t.Parallel()
15-
a := assert.New(t)
1615

1716
for _, tc := range []struct {
1817
name string
@@ -167,6 +166,7 @@ func TestScanString(t *testing.T) {
167166
} {
168167
t.Run(tc.name, func(t *testing.T) {
169168
t.Parallel()
169+
a := assert.New(t)
170170

171171
// Test double-quoted.
172172
lex := newLexer(`"` + tc.in + `"`)
@@ -201,14 +201,15 @@ func TestScanString(t *testing.T) {
201201
// Test unclosed strings.
202202
t.Run("unclosed", func(t *testing.T) {
203203
t.Parallel()
204+
a := assert.New(t)
205+
204206
a.Equal(rune(invalid), newLexer(`"food`).scanString().tok)
205207
a.Equal(rune(invalid), newLexer(`'food`).scanString().tok)
206208
})
207209
}
208210

209211
func TestScanIdentifier(t *testing.T) {
210212
t.Parallel()
211-
a := assert.New(t)
212213

213214
for _, tc := range []struct {
214215
name string
@@ -279,15 +280,13 @@ func TestScanIdentifier(t *testing.T) {
279280
t.Run(tc.name, func(t *testing.T) {
280281
t.Parallel()
281282
lex := newLexer(tc.in)
282-
a.Equal(tc.tok, lex.scanIdentifier())
283+
assert.Equal(t, tc.tok, lex.scanIdentifier())
283284
})
284285
}
285286
}
286287

287288
func TestScanNumber(t *testing.T) {
288289
t.Parallel()
289-
a := assert.New(t)
290-
r := require.New(t)
291290

292291
for _, tc := range []struct {
293292
name string
@@ -518,6 +517,9 @@ func TestScanNumber(t *testing.T) {
518517
} {
519518
t.Run(tc.name, func(t *testing.T) {
520519
t.Parallel()
520+
a := assert.New(t)
521+
r := require.New(t)
522+
521523
lex := newLexer(tc.in)
522524
tok := lex.scanNumber()
523525
a.Equal(tc.tok, tok)
@@ -550,7 +552,6 @@ func TestScanNumber(t *testing.T) {
550552

551553
func TestScanBlankSpace(t *testing.T) {
552554
t.Parallel()
553-
a := assert.New(t)
554555

555556
for _, tc := range []struct {
556557
name string
@@ -651,6 +652,8 @@ func TestScanBlankSpace(t *testing.T) {
651652
} {
652653
t.Run(tc.name, func(t *testing.T) {
653654
t.Parallel()
655+
a := assert.New(t)
656+
654657
lex := newLexer(tc.in)
655658
a.Equal(tc.tok, lex.scanBlankSpace())
656659
lex = newLexer(tc.in)
@@ -662,7 +665,6 @@ func TestScanBlankSpace(t *testing.T) {
662665

663666
func TestScanTokens(t *testing.T) {
664667
t.Parallel()
665-
a := assert.New(t)
666668

667669
for _, tc := range []struct {
668670
name string
@@ -747,6 +749,8 @@ func TestScanTokens(t *testing.T) {
747749
} {
748750
t.Run(tc.name, func(t *testing.T) {
749751
t.Parallel()
752+
a := assert.New(t)
753+
750754
lex := newLexer(tc.in)
751755
a.Equal(token{}, lex.prev)
752756
tokens := make([]token, 0, len(tc.tokens))
@@ -761,8 +765,6 @@ func TestScanTokens(t *testing.T) {
761765

762766
func TestToken(t *testing.T) {
763767
t.Parallel()
764-
a := assert.New(t)
765-
r := require.New(t)
766768

767769
for _, tc := range []struct {
768770
name string
@@ -889,6 +891,9 @@ func TestToken(t *testing.T) {
889891
} {
890892
t.Run(tc.name, func(t *testing.T) {
891893
t.Parallel()
894+
a := assert.New(t)
895+
r := require.New(t)
896+
892897
a.Equal(tc.id, tc.tok.name())
893898
a.Equal(tc.str, tc.tok.String())
894899
err := tc.tok.err()

‎parser/parse_test.go‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ func TestParseRoot(t *testing.T) {
2424

2525
func TestParseSimple(t *testing.T) {
2626
t.Parallel()
27-
a := assert.New(t)
28-
r := require.New(t)
2927
reg := registry.New()
3028

3129
for _, tc := range []struct {
@@ -179,6 +177,9 @@ func TestParseSimple(t *testing.T) {
179177
} {
180178
t.Run(tc.name, func(t *testing.T) {
181179
t.Parallel()
180+
a := assert.New(t)
181+
r := require.New(t)
182+
182183
q, err := Parse(reg, tc.path)
183184
if tc.err == "" {
184185
r.NoError(err)
@@ -194,8 +195,6 @@ func TestParseSimple(t *testing.T) {
194195

195196
func TestParseFilter(t *testing.T) {
196197
t.Parallel()
197-
a := assert.New(t)
198-
r := require.New(t)
199198
reg := registry.New()
200199
_ = reg.Register(
201200
"__true",
@@ -809,6 +808,9 @@ func TestParseFilter(t *testing.T) {
809808
} {
810809
t.Run(tc.name, func(t *testing.T) {
811810
t.Parallel()
811+
a := assert.New(t)
812+
r := require.New(t)
813+
812814
parser := &parser{lex: newLexer(tc.query), reg: reg}
813815
filter, err := parser.parseFilter()
814816
if tc.err == "" {
@@ -825,8 +827,6 @@ func TestParseFilter(t *testing.T) {
825827

826828
func TestParseSelectors(t *testing.T) {
827829
t.Parallel()
828-
a := assert.New(t)
829-
r := require.New(t)
830830
reg := registry.New()
831831

832832
for _, tc := range []struct {
@@ -1224,6 +1224,9 @@ func TestParseSelectors(t *testing.T) {
12241224
} {
12251225
t.Run(tc.name, func(t *testing.T) {
12261226
t.Parallel()
1227+
a := assert.New(t)
1228+
r := require.New(t)
1229+
12271230
q, err := Parse(reg, tc.path)
12281231
if tc.err == "" {
12291232
r.NoError(err)
@@ -1239,10 +1242,11 @@ func TestParseSelectors(t *testing.T) {
12391242

12401243
func TestMakeNumErr(t *testing.T) {
12411244
t.Parallel()
1242-
r := require.New(t)
12431245

12441246
t.Run("parse_int", func(t *testing.T) {
12451247
t.Parallel()
1248+
r := require.New(t)
1249+
12461250
_, numErr := strconv.ParseInt("170141183460469231731687303715884105727", 10, 64)
12471251
r.Error(numErr)
12481252
tok := token{invalid, "", 6}
@@ -1256,6 +1260,8 @@ func TestMakeNumErr(t *testing.T) {
12561260

12571261
t.Run("parse_float", func(t *testing.T) {
12581262
t.Parallel()
1263+
r := require.New(t)
1264+
12591265
_, numErr := strconv.ParseFloat("99e+1234", 64)
12601266
r.Error(numErr)
12611267
tok := token{invalid, "", 12}
@@ -1269,6 +1275,8 @@ func TestMakeNumErr(t *testing.T) {
12691275

12701276
t.Run("other error", func(t *testing.T) {
12711277
t.Parallel()
1278+
r := require.New(t)
1279+
12721280
myErr := errors.New("oops")
12731281
tok := token{invalid, "", 19}
12741282
err := makeNumErr(tok, myErr)
@@ -1279,8 +1287,6 @@ func TestMakeNumErr(t *testing.T) {
12791287

12801288
func TestParsePathInt(t *testing.T) {
12811289
t.Parallel()
1282-
a := assert.New(t)
1283-
r := require.New(t)
12841290

12851291
for _, tc := range []struct {
12861292
name string
@@ -1309,6 +1315,9 @@ func TestParsePathInt(t *testing.T) {
13091315
} {
13101316
t.Run(tc.name, func(t *testing.T) {
13111317
t.Parallel()
1318+
a := assert.New(t)
1319+
r := require.New(t)
1320+
13121321
num, err := parsePathInt(token{integer, tc.input, 3})
13131322
if tc.err == "" {
13141323
r.NoError(err)
@@ -1324,8 +1333,6 @@ func TestParsePathInt(t *testing.T) {
13241333

13251334
func TestParseLiteral(t *testing.T) {
13261335
t.Parallel()
1327-
a := assert.New(t)
1328-
r := require.New(t)
13291336

13301337
for _, tc := range []struct {
13311338
name string
@@ -1381,6 +1388,9 @@ func TestParseLiteral(t *testing.T) {
13811388
} {
13821389
t.Run(tc.name, func(t *testing.T) {
13831390
t.Parallel()
1391+
a := assert.New(t)
1392+
r := require.New(t)
1393+
13841394
lit, err := parseLiteral(tc.tok)
13851395
if tc.err == "" {
13861396
r.NoError(err)

‎path_test.go‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ func book(idx int) spec.NormalizedPath {
2121

2222
func TestParseSpecExamples(t *testing.T) {
2323
t.Parallel()
24-
a := assert.New(t)
25-
r := require.New(t)
2624
val := specExampleJSON(t)
2725
store, _ := val["store"].(map[string]any)
2826
books, _ := store["book"].([]any)
@@ -128,6 +126,8 @@ func TestParseSpecExamples(t *testing.T) {
128126
} {
129127
t.Run(tc.name, func(t *testing.T) {
130128
t.Parallel()
129+
a := assert.New(t)
130+
r := require.New(t)
131131

132132
// Test parsing.
133133
p := MustParse(tc.path)
@@ -225,8 +225,6 @@ func specExampleJSON(t *testing.T) map[string]any {
225225

226226
func TestParseCompliance(t *testing.T) {
227227
t.Parallel()
228-
a := assert.New(t)
229-
r := require.New(t)
230228
p := NewParser()
231229

232230
//nolint:tagliatelle
@@ -244,7 +242,7 @@ func TestParseCompliance(t *testing.T) {
244242
rawJSON, err := os.ReadFile(
245243
filepath.Join("jsonpath-compliance-test-suite", "cts.json"),
246244
)
247-
r.NoError(err)
245+
require.NoError(t, err)
248246
var ts struct {
249247
Tests []testCase `json:"tests"`
250248
}
@@ -255,6 +253,9 @@ func TestParseCompliance(t *testing.T) {
255253
for i, tc := range ts.Tests {
256254
t.Run(fmt.Sprintf("test_%03d", i), func(t *testing.T) {
257255
t.Parallel()
256+
a := assert.New(t)
257+
r := require.New(t)
258+
258259
description := fmt.Sprintf("%v: `%v`", tc.Name, tc.Selector)
259260
p, err := p.Parse(tc.Selector)
260261
if tc.InvalidSelector {
@@ -297,8 +298,6 @@ func TestParseCompliance(t *testing.T) {
297298

298299
func TestParser(t *testing.T) {
299300
t.Parallel()
300-
a := assert.New(t)
301-
r := require.New(t)
302301
reg := registry.New()
303302

304303
for _, tc := range []struct {
@@ -327,6 +326,8 @@ func TestParser(t *testing.T) {
327326
} {
328327
t.Run(tc.name, func(t *testing.T) {
329328
t.Parallel()
329+
a := assert.New(t)
330+
r := require.New(t)
330331

331332
// Construct a parser.
332333
var parser *Parser
@@ -396,7 +397,6 @@ func norm(sel ...any) spec.NormalizedPath {
396397

397398
func TestNodeList(t *testing.T) {
398399
t.Parallel()
399-
a := assert.New(t)
400400

401401
for _, tc := range []struct {
402402
name string
@@ -425,6 +425,8 @@ func TestNodeList(t *testing.T) {
425425
} {
426426
t.Run(tc.name, func(t *testing.T) {
427427
t.Parallel()
428+
a := assert.New(t)
429+
428430
// Test iterators.
429431
if len(tc.list) == 0 {
430432
a.Nil(slices.Collect(tc.list.All()))
@@ -437,7 +439,6 @@ func TestNodeList(t *testing.T) {
437439

438440
func TestLocatedNodeList(t *testing.T) {
439441
t.Parallel()
440-
a := assert.New(t)
441442

442443
for _, tc := range []struct {
443444
name string
@@ -572,6 +573,7 @@ func TestLocatedNodeList(t *testing.T) {
572573
} {
573574
t.Run(tc.name, func(t *testing.T) {
574575
t.Parallel()
576+
a := assert.New(t)
575577

576578
// Test iterators.
577579
if len(tc.list) == 0 {

0 commit comments

Comments
 (0)