Skip to content

Commit 22c7c27

Browse files
committed
Remove testify dependency
1 parent f1a76a1 commit 22c7c27

File tree

3 files changed

+35
-35
lines changed

3 files changed

+35
-35
lines changed

go.mod

-8
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,3 @@ module github.com/sj14/epoch
33
go 1.22
44

55
retract [v1.2.0, v1.2.3]
6-
7-
require github.com/stretchr/testify v1.9.0
8-
9-
require (
10-
github.com/davecgh/go-spew v1.1.1 // indirect
11-
github.com/pmezard/go-difflib v1.0.0 // indirect
12-
gopkg.in/yaml.v3 v3.0.1 // indirect
13-
)

go.sum

-10
Original file line numberDiff line numberDiff line change
@@ -1,10 +0,0 @@
1-
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
2-
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
3-
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
4-
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
5-
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
6-
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
7-
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
8-
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
9-
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
10-
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

pkg/epoch/epoch_test.go

+35-17
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,31 @@ package epoch
22

33
import (
44
"errors"
5+
"reflect"
56
"testing"
67
"time"
7-
8-
"github.com/stretchr/testify/require"
98
)
109

10+
func equalError(t *testing.T, got, want error) {
11+
t.Helper()
12+
13+
if (got == nil && want != nil) ||
14+
(got != nil && want == nil) ||
15+
(got.Error() != want.Error()) {
16+
t.Logf("got %q, want %q", got, want)
17+
t.FailNow()
18+
}
19+
}
20+
21+
func equal[T any](t *testing.T, got, want T) {
22+
t.Helper()
23+
24+
if !reflect.DeepEqual(got, want) {
25+
t.Logf("got '%#v', want '%#v", got, want)
26+
t.FailNow()
27+
}
28+
}
29+
1130
func TestParseUnit(t *testing.T) {
1231
testCases := []struct {
1332
description string
@@ -46,14 +65,13 @@ func TestParseUnit(t *testing.T) {
4665
t.Run(tt.description, func(t *testing.T) {
4766
unit, err := ParseUnit(tt.given)
4867
if err != nil {
49-
require.EqualError(t, tt.expectedErr, err.Error(), err)
68+
equalError(t, err, tt.expectedErr)
5069
return
5170
} else if tt.expectedErr != nil {
52-
require.EqualError(t, err, tt.expectedErr.Error(), tt.expectedErr)
71+
equalError(t, err, tt.expectedErr)
5372
return
5473
}
55-
56-
require.Equal(t, tt.expected, unit)
74+
equal(t, unit, tt.expected)
5775
})
5876
}
5977
}
@@ -109,14 +127,14 @@ func TestToTimestamp(t *testing.T) {
109127
t.Run(tt.description, func(t *testing.T) {
110128
timestamp, err := ToTimestamp(tt.given.time, tt.given.unit)
111129
if err != nil {
112-
require.EqualError(t, tt.expected.err, err.Error(), err)
130+
equalError(t, err, tt.expected.err)
113131
return
114132
} else if tt.expected.err != nil {
115-
require.EqualError(t, err, tt.expected.err.Error(), tt.expected.err)
133+
equalError(t, err, tt.expected.err)
116134
return
117135
}
118136

119-
require.Equal(t, tt.expected.timestamp, timestamp)
137+
equal(t, timestamp, tt.expected.timestamp)
120138
})
121139
}
122140
}
@@ -172,14 +190,14 @@ func TestParseTimestamp(t *testing.T) {
172190
t.Run(tt.description, func(t *testing.T) {
173191
timestamp, err := ParseTimestamp(tt.given.timestamp, tt.given.unit)
174192
if err != nil {
175-
require.EqualError(t, tt.expected.err, err.Error(), err)
193+
equalError(t, err, tt.expected.err)
176194
return
177195
} else if tt.expected.err != nil {
178-
require.EqualError(t, err, tt.expected.err.Error(), tt.expected.err)
196+
equalError(t, err, tt.expected.err)
179197
return
180198
}
181199

182-
require.Equal(t, tt.expected.time.UTC(), timestamp.UTC())
200+
equal(t, timestamp.UTC(), tt.expected.time.UTC())
183201
})
184202
}
185203
}
@@ -230,7 +248,7 @@ func TestGuessUnit(t *testing.T) {
230248
for _, tt := range testCases {
231249
t.Run(tt.description, func(t *testing.T) {
232250
unit := GuessUnit(tt.given.timestamp, tt.given.ref)
233-
require.Equal(t, tt.expected.unit, unit)
251+
equal(t, unit, tt.expected.unit)
234252
})
235253
}
236254
}
@@ -266,16 +284,16 @@ func TestParseFormatted(t *testing.T) {
266284
for _, tt := range testCases {
267285
t.Run(tt.description, func(t *testing.T) {
268286
parsed, layout, err := ParseFormatted(tt.given.formatted)
269-
require.Equal(t, tt.expected.layout, layout)
287+
equal(t, layout, tt.expected.layout)
270288
if err != nil {
271-
require.EqualError(t, tt.expected.err, err.Error(), err)
289+
equalError(t, err, tt.expected.err)
272290
return
273291
} else if tt.expected.err != nil {
274-
require.EqualError(t, err, tt.expected.err.Error(), tt.expected.err)
292+
equalError(t, err, tt.expected.err)
275293
return
276294
}
277295

278-
require.Equal(t, tt.expected.time, parsed)
296+
equal(t, parsed, tt.expected.time)
279297
})
280298
}
281299
}

0 commit comments

Comments
 (0)