Skip to content

Commit 64f4429

Browse files
committed
lint tests: check all errors
1 parent cc0ada4 commit 64f4429

15 files changed

+314
-115
lines changed

encoding/ewkb/ewkb_test.go

+13-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ import (
1313

1414
func TestMarshal(t *testing.T) {
1515
for _, g := range orb.AllGeometries {
16-
Marshal(g, 0, binary.BigEndian)
16+
_, err := Marshal(g, 0, binary.BigEndian)
17+
if err != nil {
18+
t.Fatalf("unexpected error: %v", err)
19+
}
1720
}
1821
}
1922

@@ -39,7 +42,10 @@ func BenchmarkEncode_Point(b *testing.B) {
3942
b.ReportAllocs()
4043
b.ResetTimer()
4144
for i := 0; i < b.N; i++ {
42-
e.Encode(g)
45+
err := e.Encode(g)
46+
if err != nil {
47+
b.Fatalf("unexpected error: %v", err)
48+
}
4349
}
4450
}
4551

@@ -53,7 +59,10 @@ func BenchmarkEncode_LineString(b *testing.B) {
5359
b.ReportAllocs()
5460
b.ResetTimer()
5561
for i := 0; i < b.N; i++ {
56-
e.Encode(g)
62+
err := e.Encode(g)
63+
if err != nil {
64+
b.Fatalf("unexpected error: %v", err)
65+
}
5766
}
5867
}
5968

@@ -129,7 +138,7 @@ func compare(t testing.TB, e orb.Geometry, s int, b []byte) {
129138
// pass in srid
130139
buf.Reset()
131140
en.SetSRID(10101)
132-
en.Encode(e, s)
141+
err = en.Encode(e, s)
133142
if err != nil {
134143
t.Errorf("encode with srid error: %v", err)
135144
}

encoding/internal/wkbcommon/wkb_test.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ import (
1010

1111
func TestMarshal(t *testing.T) {
1212
for _, g := range orb.AllGeometries {
13-
Marshal(g, 0, binary.BigEndian)
13+
_, err := Marshal(g, 0, binary.BigEndian)
14+
if err != nil {
15+
t.Fatalf("unexpected error: %v", err)
16+
}
1417
}
1518
}
1619

encoding/mvt/example_test.go

+7-2
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,19 @@ func ExampleMarshal() {
2727

2828
// encoding using the Mapbox Vector Tile protobuf encoding.
2929
data, err := mvt.Marshal(layers) // this data is NOT gzipped.
30+
_ = data
31+
32+
// error checking
33+
if err != nil {
34+
log.Fatalf("marshal error: %v", err)
35+
}
3036

3137
// Sometimes MVT data is stored and transferred gzip compressed. In that case:
3238
data, err = mvt.MarshalGzipped(layers)
39+
_ = data
3340

3441
// error checking
3542
if err != nil {
3643
log.Fatalf("marshal error: %v", err)
3744
}
38-
39-
_ = data
4045
}

encoding/mvt/marshal_test.go

+8-2
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,10 @@ func BenchmarkMarshal(b *testing.B) {
558558
b.ResetTimer()
559559

560560
for i := 0; i < b.N; i++ {
561-
Marshal(layers)
561+
_, err := Marshal(layers)
562+
if err != nil {
563+
b.Fatalf("unexpected error: %v", err)
564+
}
562565
}
563566
}
564567

@@ -573,7 +576,10 @@ func BenchmarkUnmarshal(b *testing.B) {
573576
b.ResetTimer()
574577

575578
for i := 0; i < b.N; i++ {
576-
Unmarshal(data)
579+
_, err := Unmarshal(data)
580+
if err != nil {
581+
b.Fatalf("unexpected error: %v", err)
582+
}
577583
}
578584
}
579585

encoding/wkb/wkb_test.go

+12-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ import (
1212

1313
func TestMarshal(t *testing.T) {
1414
for _, g := range orb.AllGeometries {
15-
Marshal(g, binary.BigEndian)
15+
_, err := Marshal(g, binary.BigEndian)
16+
if err != nil {
17+
t.Fatalf("unexpected error: %v", err)
18+
}
1619
}
1720
}
1821

@@ -29,7 +32,10 @@ func BenchmarkEncode_Point(b *testing.B) {
2932
b.ReportAllocs()
3033
b.ResetTimer()
3134
for i := 0; i < b.N; i++ {
32-
e.Encode(g)
35+
err := e.Encode(g)
36+
if err != nil {
37+
b.Fatalf("unexpected error: %v", err)
38+
}
3339
}
3440
}
3541

@@ -43,7 +49,10 @@ func BenchmarkEncode_LineString(b *testing.B) {
4349
b.ReportAllocs()
4450
b.ResetTimer()
4551
for i := 0; i < b.N; i++ {
46-
e.Encode(g)
52+
err := e.Encode(g)
53+
if err != nil {
54+
b.Fatalf("unexpected error: %v", err)
55+
}
4756
}
4857
}
4958

geojson/example_pointer_test.go

+9-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package geojson_test
22

33
import (
44
"fmt"
5+
"log"
56

67
"github.com/paulmach/orb"
78
"github.com/paulmach/orb/geojson"
@@ -26,12 +27,18 @@ func Example_centroid() {
2627
// feature with center {0.5, 0.5} but centroid {0.25, 0.25}
2728
f := geojson.NewFeature(orb.MultiPoint{{0, 0}, {0, 0}, {0, 0}, {1, 1}})
2829
f.Properties["centroid"] = "0.25"
29-
qt.Add(CentroidPoint{f})
30+
err := qt.Add(CentroidPoint{f})
31+
if err != nil {
32+
log.Fatalf("unexpected error: %v", err)
33+
}
3034

3135
// feature with centroid {0.6, 0.6}
3236
f = geojson.NewFeature(orb.Point{0.6, 0.6})
3337
f.Properties["centroid"] = "0.6"
34-
qt.Add(CentroidPoint{f})
38+
err = qt.Add(CentroidPoint{f})
39+
if err != nil {
40+
log.Fatalf("unexpected error: %v", err)
41+
}
3542

3643
feature := qt.Find(orb.Point{0.5, 0.5}).(CentroidPoint).Feature
3744
fmt.Printf("centroid=%s", feature.Properties["centroid"])

geojson/example_test.go

+14-5
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ func ExampleFeature_Point() {
1515
f.Properties["key"] = "value"
1616

1717
qt := quadtree.New(f.Geometry.Bound().Pad(1))
18-
qt.Add(f) // add the feature to a quadtree
18+
err := qt.Add(f) // add the feature to a quadtree
19+
if err != nil {
20+
log.Fatalf("unexpected error: %v", err)
21+
}
1922

2023
// type assert the feature back into a Feature from
2124
// the orb.Pointer interface.
@@ -39,7 +42,10 @@ func ExampleFeatureCollection_foreignMembers() {
3942
}`)
4043

4144
fc := geojson.NewFeatureCollection()
42-
json.Unmarshal(rawJSON, &fc)
45+
err := json.Unmarshal(rawJSON, &fc)
46+
if err != nil {
47+
log.Fatalf("invalid json: %v", err)
48+
}
4349

4450
fmt.Println(fc.Features[0].Geometry)
4551
fmt.Println(fc.ExtraMembers["title"])
@@ -90,7 +96,10 @@ func ExampleFeatureCollection_foreignMembersCustom() {
9096
}`)
9197

9298
fc := &MyFeatureCollection{}
93-
json.Unmarshal(rawJSON, &fc)
99+
err := json.Unmarshal(rawJSON, &fc)
100+
if err != nil {
101+
log.Fatalf("invalid json: %v", err)
102+
}
94103

95104
fmt.Println(fc.FeatureCollection.Features[0].Geometry)
96105
fmt.Println(fc.Features[0].Geometry)
@@ -151,13 +160,13 @@ func ExampleFeatureCollection_MarshalJSON() {
151160
fc := geojson.NewFeatureCollection()
152161
fc.Append(geojson.NewFeature(orb.Point{1, 2}))
153162

154-
data, err := fc.MarshalJSON()
163+
_, err := fc.MarshalJSON()
155164
if err != nil {
156165
log.Fatalf("marshal error: %v", err)
157166
}
158167

159168
// standard lib encoding/json package will also work
160-
data, err = json.MarshalIndent(fc, "", " ")
169+
data, err := json.MarshalIndent(fc, "", " ")
161170
if err != nil {
162171
log.Fatalf("marshal error: %v", err)
163172
}

geojson/geometry_test.go

+8-2
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,10 @@ func BenchmarkGeometryMarshalJSON(b *testing.B) {
356356
b.ReportAllocs()
357357
b.ResetTimer()
358358
for i := 0; i < b.N; i++ {
359-
g.MarshalJSON()
359+
_, err := g.MarshalJSON()
360+
if err != nil {
361+
b.Fatalf("unexpected error: %v", err)
362+
}
360363
}
361364
}
362365

@@ -375,6 +378,9 @@ func BenchmarkGeometryUnmarshalJSON(b *testing.B) {
375378
b.ReportAllocs()
376379
b.ResetTimer()
377380
for i := 0; i < b.N; i++ {
378-
g.UnmarshalJSON(data)
381+
err := g.UnmarshalJSON(data)
382+
if err != nil {
383+
b.Fatalf("unexpected error: %v", err)
384+
}
379385
}
380386
}

maptile/tilecover/benchmarks_test.go

+40-10
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ func BenchmarkPoint(b *testing.B) {
1212
b.ReportAllocs()
1313
b.ResetTimer()
1414
for i := 0; i < b.N; i++ {
15-
Geometry(p, 6)
15+
_, err := Geometry(p, 6)
16+
if err != nil {
17+
b.Fatalf("unexpected error: %v", err)
18+
}
1619
}
1720
}
1821

@@ -22,7 +25,10 @@ func BenchmarkRoad_z6(b *testing.B) {
2225
b.ReportAllocs()
2326
b.ResetTimer()
2427
for i := 0; i < b.N; i++ {
25-
Geometry(g, 6)
28+
_, err := Geometry(g, 6)
29+
if err != nil {
30+
b.Fatalf("unexpected error: %v", err)
31+
}
2632
}
2733
}
2834

@@ -32,7 +38,10 @@ func BenchmarkRoad_z18(b *testing.B) {
3238
b.ReportAllocs()
3339
b.ResetTimer()
3440
for i := 0; i < b.N; i++ {
35-
Geometry(g, 18)
41+
_, err := Geometry(g, 18)
42+
if err != nil {
43+
b.Fatalf("unexpected error: %v", err)
44+
}
3645
}
3746
}
3847

@@ -42,7 +51,10 @@ func BenchmarkRoad_z28(b *testing.B) {
4251
b.ReportAllocs()
4352
b.ResetTimer()
4453
for i := 0; i < b.N; i++ {
45-
Geometry(g, 28)
54+
_, err := Geometry(g, 28)
55+
if err != nil {
56+
b.Fatalf("unexpected error: %v", err)
57+
}
4658
}
4759
}
4860

@@ -52,7 +64,10 @@ func BenchmarkRussia_z6(b *testing.B) {
5264
b.ReportAllocs()
5365
b.ResetTimer()
5466
for i := 0; i < b.N; i++ {
55-
Geometry(g, 6)
67+
_, err := Geometry(g, 6)
68+
if err != nil {
69+
b.Fatalf("unexpected error: %v", err)
70+
}
5671
}
5772
}
5873

@@ -62,7 +77,10 @@ func BenchmarkRussia_z8(b *testing.B) {
6277
b.ReportAllocs()
6378
b.ResetTimer()
6479
for i := 0; i < b.N; i++ {
65-
Geometry(g, 8)
80+
_, err := Geometry(g, 8)
81+
if err != nil {
82+
b.Fatalf("unexpected error: %v", err)
83+
}
6684
}
6785
}
6886

@@ -72,7 +90,10 @@ func BenchmarkRussia_z10(b *testing.B) {
7290
b.ReportAllocs()
7391
b.ResetTimer()
7492
for i := 0; i < b.N; i++ {
75-
Geometry(g, 10)
93+
_, err := Geometry(g, 10)
94+
if err != nil {
95+
b.Fatalf("unexpected error: %v", err)
96+
}
7697
}
7798
}
7899

@@ -94,7 +115,10 @@ func BenchmarkRussiaLine_z6(b *testing.B) {
94115
b.ReportAllocs()
95116
b.ResetTimer()
96117
for i := 0; i < b.N; i++ {
97-
Geometry(g, 6)
118+
_, err := Geometry(g, 6)
119+
if err != nil {
120+
b.Fatalf("unexpected error: %v", err)
121+
}
98122
}
99123
}
100124

@@ -105,7 +129,10 @@ func BenchmarkRussiaLine_z8(b *testing.B) {
105129
b.ReportAllocs()
106130
b.ResetTimer()
107131
for i := 0; i < b.N; i++ {
108-
Geometry(g, 8)
132+
_, err := Geometry(g, 8)
133+
if err != nil {
134+
b.Fatalf("unexpected error: %v", err)
135+
}
109136
}
110137
}
111138

@@ -116,6 +143,9 @@ func BenchmarkRussiaLine_z10(b *testing.B) {
116143
b.ReportAllocs()
117144
b.ResetTimer()
118145
for i := 0; i < b.N; i++ {
119-
Geometry(g, 10)
146+
_, err := Geometry(g, 10)
147+
if err != nil {
148+
b.Fatalf("unexpected error: %v", err)
149+
}
120150
}
121151
}

maptile/tilecover/helpers_test.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ import (
88

99
func TestGeometry(t *testing.T) {
1010
for _, g := range orb.AllGeometries {
11-
Geometry(g, 1)
11+
_, err := Geometry(g, 1)
12+
if err != nil {
13+
t.Fatalf("unexpected error for %T: %v", g, err)
14+
}
1215
}
1316
}

0 commit comments

Comments
 (0)