Skip to content

Commit a4c2691

Browse files
committed
chore(lint): relinted tests
Signed-off-by: Frederic BIDON <[email protected]>
1 parent 596aca2 commit a4c2691

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

api_test.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
package errors
1616

1717
import (
18+
"errors"
1819
"fmt"
1920
"net/http"
2021
"net/http/httptest"
@@ -71,7 +72,7 @@ func TestServeError(t *testing.T) {
7172
}()
7273

7374
// defaults to internal server error
74-
simpleErr := fmt.Errorf("some error")
75+
simpleErr := errors.New("some error")
7576
recorder = httptest.NewRecorder()
7677
ServeError(recorder, nil, simpleErr)
7778
assert.Equal(t, http.StatusInternalServerError, recorder.Code)
@@ -83,8 +84,8 @@ func TestServeError(t *testing.T) {
8384
// unrecognized: return internal error with first error only - the second error is ignored
8485
compositeErr := &CompositeError{
8586
Errors: []error{
86-
fmt.Errorf("firstError"),
87-
fmt.Errorf("anotherError"),
87+
errors.New("firstError"),
88+
errors.New("anotherError"),
8889
},
8990
}
9091
recorder = httptest.NewRecorder()
@@ -245,7 +246,7 @@ func TestMarshalJSON(t *testing.T) {
245246
require.NoError(t, err)
246247
assert.JSONEq(t, fmt.Sprintf(`{"code":1,"message":"a","errors":[%s]}`, expectedJSON), string(jazon))
247248

248-
p := ParseError{code: 1, message: "x", Name: "a", In: "b", Value: "c", Reason: fmt.Errorf("d")}
249+
p := ParseError{code: 1, message: "x", Name: "a", In: "b", Value: "c", Reason: errors.New("d")}
249250
jazon, err = p.MarshalJSON()
250251
require.NoError(t, err)
251252
assert.JSONEq(t, `{"code":1,"message":"x","name":"a","in":"b","value":"c","reason":"d"}`, string(jazon))

schema_test.go

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ package errors
1616

1717
import (
1818
"errors"
19-
"fmt"
2019
"testing"
2120

2221
"github.com/stretchr/testify/assert"
@@ -248,7 +247,7 @@ func TestSchemaErrors(t *testing.T) {
248247
require.Error(t, err)
249248
assert.EqualValues(t, MultipleOfFailCode, err.Code())
250249
assert.Equal(t, "something in query should be a multiple of 5", err.Error())
251-
assert.Equal(t, float64(1), err.Value)
250+
assert.InDelta(t, float64(1), err.Value, 1e-6)
252251

253252
err = NotMultipleOf("something", "query", uint64(5), uint64(1))
254253
require.Error(t, err)
@@ -266,7 +265,7 @@ func TestSchemaErrors(t *testing.T) {
266265
require.Error(t, err)
267266
assert.EqualValues(t, MultipleOfMustBePositiveCode, err.Code())
268267
assert.Equal(t, `factor MultipleOf declared for path must be positive: -10`, err.Error())
269-
assert.Equal(t, float64(-10), err.Value)
268+
assert.InDelta(t, float64(-10), err.Value, 1e-6)
270269

271270
err = MultipleOfMustBePositive("path", "body", int64(-10))
272271
require.Error(t, err)
@@ -294,27 +293,27 @@ func TestSchemaErrors(t *testing.T) {
294293
require.Error(t, err)
295294
assert.EqualValues(t, RequiredFailCode, err.Code())
296295
assert.Equal(t, "something in query is required", err.Error())
297-
assert.Equal(t, nil, err.Value)
296+
assert.Nil(t, err.Value)
298297

299298
err = Required("something", "", nil)
300299
require.Error(t, err)
301300
assert.EqualValues(t, RequiredFailCode, err.Code())
302301
assert.Equal(t, "something is required", err.Error())
303-
assert.Equal(t, nil, err.Value)
302+
assert.Nil(t, err.Value)
304303
})
305304

306305
t.Run("with ReadOnly", func(t *testing.T) {
307306
err := ReadOnly("something", "query", nil)
308307
require.Error(t, err)
309308
assert.EqualValues(t, ReadOnlyFailCode, err.Code())
310309
assert.Equal(t, "something in query is readOnly", err.Error())
311-
assert.Equal(t, nil, err.Value)
310+
assert.Nil(t, err.Value)
312311

313312
err = ReadOnly("something", "", nil)
314313
require.Error(t, err)
315314
assert.EqualValues(t, ReadOnlyFailCode, err.Code())
316315
assert.Equal(t, "something is readOnly", err.Error())
317-
assert.Equal(t, nil, err.Value)
316+
assert.Nil(t, err.Value)
318317
})
319318

320319
t.Run("with TooLong/TooShort", func(t *testing.T) {
@@ -387,8 +386,8 @@ func TestSchemaErrors(t *testing.T) {
387386
assert.EqualValues(t, CompositeErrorCode, err.Code())
388387
assert.Equal(t, "validation failure list", err.Error())
389388

390-
testErr1 := fmt.Errorf("first error")
391-
testErr2 := fmt.Errorf("second error")
389+
testErr1 := errors.New("first error")
390+
testErr2 := errors.New("second error")
392391
err = CompositeValidationError(testErr1, testErr2)
393392
require.Error(t, err)
394393
assert.EqualValues(t, CompositeErrorCode, err.Code())

0 commit comments

Comments
 (0)