Skip to content

Commit 90c996c

Browse files
awalterschulzeawalterschulze
committed
use expect.NoErr
1 parent be65684 commit 90c996c

4 files changed

Lines changed: 25 additions & 69 deletions

File tree

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ module github.com/katydid/parser-go-json
22

33
go 1.24
44

5-
require github.com/katydid/parser-go v0.7.9
5+
require github.com/katydid/parser-go v0.7.10

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github.com/katydid/parser-go v0.7.9 h1:hwH4EBo8SSW/NZ2RxSpFF2nQzIg9Mt1+9aNVd7ULiB4=
2-
github.com/katydid/parser-go v0.7.9/go.mod h1:e6PzxUlxRtkeyCMHQW7l+xG6/r/3edg14k2KK4l2WL4=
1+
github.com/katydid/parser-go v0.7.10 h1:ZAwaPKqYoc4aMOBA5Vxmg38knfYCIEC/GjCwJVwY9VE=
2+
github.com/katydid/parser-go v0.7.10/go.mod h1:e6PzxUlxRtkeyCMHQW7l+xG6/r/3edg14k2KK4l2WL4=

‎json/parse/parse_test.go‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,7 @@ func TestParseExample(t *testing.T) {
4545
expect.Hint(t, p, parse.ValueHint)
4646
expect.True(t, p)
4747

48-
if err := p.Skip(); err != nil {
49-
t.Fatal(err)
50-
}
48+
expect.NoErr(t, p.Skip)
5149

5250
expect.Hint(t, p, parse.KeyHint)
5351
expect.String(t, p, "obj")
@@ -63,13 +61,9 @@ func TestParseExample(t *testing.T) {
6361
expect.Hint(t, p, parse.KeyHint)
6462
expect.String(t, p, "a")
6563

66-
if err := p.Skip(); err != nil {
67-
t.Fatal(err)
68-
}
64+
expect.NoErr(t, p.Skip)
6965

70-
if err := p.Skip(); err != nil {
71-
t.Fatal(err)
72-
}
66+
expect.NoErr(t, p.Skip)
7367

7468
expect.Hint(t, p, parse.ObjectCloseHint)
7569
expect.EOF(t, p)

‎json/parse/skip_test.go‎

Lines changed: 19 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -25,29 +25,23 @@ import (
2525
func TestSkipUnknownObject(t *testing.T) {
2626
str := `{}`
2727
p := NewParser(WithBuffer([]byte(str)))
28-
if err := p.Skip(); err != nil {
29-
t.Fatal(err)
30-
}
28+
expect.NoErr(t, p.Skip)
3129
expect.Hint(t, p, parse.ObjectCloseHint)
3230
expect.EOF(t, p)
3331
}
3432

3533
func TestSkipUnknownArray(t *testing.T) {
3634
str := `[]`
3735
p := NewParser(WithBuffer([]byte(str)))
38-
if err := p.Skip(); err != nil {
39-
t.Fatal(err)
40-
}
36+
expect.NoErr(t, p.Skip)
4137
expect.Hint(t, p, parse.ArrayCloseHint)
4238
expect.EOF(t, p)
4339
}
4440

4541
func TestSkipUnknownArrayOpen(t *testing.T) {
4642
str := `[1]`
4743
p := NewParser(WithBuffer([]byte(str)))
48-
if err := p.Skip(); err != nil {
49-
t.Fatal(err)
50-
}
44+
expect.NoErr(t, p.Skip)
5145
expect.Hint(t, p, parse.ValueHint)
5246
expect.Int(t, p, 1)
5347
expect.Hint(t, p, parse.ArrayCloseHint)
@@ -57,9 +51,7 @@ func TestSkipUnknownArrayOpen(t *testing.T) {
5751
func TestSkipUnknownString(t *testing.T) {
5852
str := `"abc"`
5953
p := NewParser(WithBuffer([]byte(str)))
60-
if err := p.Skip(); err != nil {
61-
t.Fatal(err)
62-
}
54+
expect.NoErr(t, p.Skip)
6355
expect.EOF(t, p)
6456
}
6557

@@ -68,9 +60,7 @@ func TestSkipArrayOpen(t *testing.T) {
6860
str := `[1,2]`
6961
p := NewParser(WithBuffer([]byte(str)))
7062
expect.Hint(t, p, parse.ArrayOpenHint)
71-
if err := p.Skip(); err != nil {
72-
t.Fatal(err)
73-
}
63+
expect.NoErr(t, p.Skip)
7464
// skipped over 1,2]
7565
expect.EOF(t, p)
7666
}
@@ -80,9 +70,7 @@ func TestSkipArrayNestedOpen(t *testing.T) {
8070
p := NewParser(WithBuffer([]byte(str)))
8171
expect.Hint(t, p, parse.ArrayOpenHint)
8272
expect.Hint(t, p, parse.ArrayOpenHint)
83-
if err := p.Skip(); err != nil {
84-
t.Fatal(err)
85-
}
73+
expect.NoErr(t, p.Skip)
8674
// skipped over 1,2]
8775
expect.Hint(t, p, parse.ArrayCloseHint)
8876
expect.EOF(t, p)
@@ -95,9 +83,7 @@ func TestSkipArrayElement(t *testing.T) {
9583
expect.Hint(t, p, parse.ArrayOpenHint)
9684
expect.Hint(t, p, parse.ValueHint)
9785
expect.Int(t, p, 1)
98-
if err := p.Skip(); err != nil {
99-
t.Fatal(err)
100-
}
86+
expect.NoErr(t, p.Skip)
10187
// skipped over 2,3]
10288
expect.EOF(t, p)
10389
}
@@ -111,9 +97,7 @@ func TestSkipArrayNestedElement(t *testing.T) {
11197
expect.Hint(t, p, parse.ArrayOpenHint)
11298
expect.Hint(t, p, parse.ValueHint)
11399
expect.Int(t, p, 2)
114-
if err := p.Skip(); err != nil {
115-
t.Fatal(err)
116-
}
100+
expect.NoErr(t, p.Skip)
117101
// skipped over 3,4]
118102
expect.Hint(t, p, parse.ValueHint)
119103
expect.Int(t, p, 5)
@@ -127,9 +111,7 @@ func TestSkipArrayRecursiveElement(t *testing.T) {
127111
expect.Hint(t, p, parse.ArrayOpenHint)
128112
expect.Hint(t, p, parse.ValueHint)
129113
expect.Int(t, p, 1)
130-
if err := p.Skip(); err != nil {
131-
t.Fatal(err)
132-
}
114+
expect.NoErr(t, p.Skip)
133115
// skipped over [2,3],[[4,5,6]]]
134116
expect.EOF(t, p)
135117
}
@@ -139,9 +121,7 @@ func TestSkipObjectOpen(t *testing.T) {
139121
str := `{"a":1,"b":2}`
140122
p := NewParser(WithBuffer([]byte(str)))
141123
expect.Hint(t, p, parse.ObjectOpenHint)
142-
if err := p.Skip(); err != nil {
143-
t.Fatal(err)
144-
}
124+
expect.NoErr(t, p.Skip)
145125
// skipped over "a":1,"b":2}
146126
expect.EOF(t, p)
147127
}
@@ -153,9 +133,7 @@ func TestSkipObjectNestedOpen(t *testing.T) {
153133
expect.Hint(t, p, parse.KeyHint)
154134
expect.String(t, p, "a")
155135
expect.Hint(t, p, parse.ObjectOpenHint)
156-
if err := p.Skip(); err != nil {
157-
t.Fatal(err)
158-
}
136+
expect.NoErr(t, p.Skip)
159137
// skipped over "b":1,"c":2}
160138
expect.Hint(t, p, parse.ObjectCloseHint)
161139
expect.EOF(t, p)
@@ -170,9 +148,7 @@ func TestSkipObjectKey(t *testing.T) {
170148
expect.String(t, p, "a")
171149
expect.Hint(t, p, parse.ValueHint)
172150
expect.Int(t, p, 1)
173-
if err := p.Skip(); err != nil {
174-
t.Fatal(err)
175-
}
151+
expect.NoErr(t, p.Skip)
176152
// skipped over "b":2,"c":3}
177153
expect.EOF(t, p)
178154
}
@@ -188,9 +164,7 @@ func TestSkipObjectNestedKey(t *testing.T) {
188164
expect.String(t, p, "b")
189165
expect.Hint(t, p, parse.ValueHint)
190166
expect.Int(t, p, 1)
191-
if err := p.Skip(); err != nil {
192-
t.Fatal(err)
193-
}
167+
expect.NoErr(t, p.Skip)
194168
// skipped over "c":2,"d":3}
195169
expect.Hint(t, p, parse.ObjectCloseHint)
196170
expect.EOF(t, p)
@@ -203,14 +177,10 @@ func TestSkipObjectValue(t *testing.T) {
203177
expect.Hint(t, p, parse.ObjectOpenHint)
204178
expect.Hint(t, p, parse.KeyHint)
205179
expect.String(t, p, "a")
206-
if err := p.Skip(); err != nil {
207-
t.Fatal(err)
208-
}
180+
expect.NoErr(t, p.Skip)
209181
expect.Hint(t, p, parse.KeyHint)
210182
expect.String(t, p, "b")
211-
if err := p.Skip(); err != nil {
212-
t.Fatal(err)
213-
}
183+
expect.NoErr(t, p.Skip)
214184
// skipped over 2
215185
expect.Hint(t, p, parse.ObjectCloseHint)
216186
expect.EOF(t, p)
@@ -222,14 +192,10 @@ func TestSkipObjectRecursiveValue(t *testing.T) {
222192
expect.Hint(t, p, parse.ObjectOpenHint)
223193
expect.Hint(t, p, parse.KeyHint)
224194
expect.String(t, p, "a")
225-
if err := p.Skip(); err != nil {
226-
t.Fatal(err)
227-
}
195+
expect.NoErr(t, p.Skip)
228196
expect.Hint(t, p, parse.KeyHint)
229197
expect.String(t, p, "b")
230-
if err := p.Skip(); err != nil {
231-
t.Fatal(err)
232-
}
198+
expect.NoErr(t, p.Skip)
233199
// skipped over {"c":{"d":{"e":"f"},"g":[1,2]}}
234200
expect.Hint(t, p, parse.ObjectCloseHint)
235201
expect.EOF(t, p)
@@ -241,18 +207,14 @@ func TestSkipObjectDeepRecursiveValue(t *testing.T) {
241207
expect.Hint(t, p, parse.ObjectOpenHint)
242208
expect.Hint(t, p, parse.KeyHint)
243209
expect.String(t, p, "a")
244-
if err := p.Skip(); err != nil {
245-
t.Fatal(err)
246-
}
210+
expect.NoErr(t, p.Skip)
247211
expect.Hint(t, p, parse.KeyHint)
248212
expect.String(t, p, "b")
249213

250214
expect.Hint(t, p, parse.ObjectOpenHint)
251215
expect.Hint(t, p, parse.KeyHint)
252216
expect.String(t, p, "c")
253-
if err := p.Skip(); err != nil {
254-
t.Fatal(err)
255-
}
217+
expect.NoErr(t, p.Skip)
256218
// skipped over {"d":{"e":"f"},"g":[1,2]}
257219
expect.Hint(t, p, parse.ObjectCloseHint)
258220
expect.Hint(t, p, parse.ObjectCloseHint)

0 commit comments

Comments
 (0)