Skip to content

Commit affeb28

Browse files
gab-arrobogab-arrobo
authored
Remove github.com/stretchr/testify and rely only in GO testing package (#201)
Signed-off-by: Arrobo, Gabriel <[email protected]>
1 parent b13f3ec commit affeb28

File tree

7 files changed

+143
-76
lines changed

7 files changed

+143
-76
lines changed

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.5.6-dev
1+
1.5.6

‎flowdesc/ip_filter_rule_field_test.go‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ package flowdesc
66

77
import (
88
"testing"
9-
10-
"github.com/stretchr/testify/require"
119
)
1210

1311
func TestBuildIPFilterRuleFromField(t *testing.T) {
@@ -94,10 +92,16 @@ func TestBuildIPFilterRuleFromField(t *testing.T) {
9492
for _, tc := range testCases {
9593
t.Run(tc.name, func(t *testing.T) {
9694
ipFilterRule, err := BuildIPFilterRuleFromField(tc.configList)
97-
require.NoError(t, err)
95+
if err != nil {
96+
t.Fatalf("unexpected error: %v", err)
97+
}
9898
filterRuleContent, err := Encode(ipFilterRule)
99-
require.NoError(t, err)
100-
require.Equal(t, tc.ipFilterRule, filterRuleContent)
99+
if err != nil {
100+
t.Fatalf("unexpected error: %v", err)
101+
}
102+
if tc.ipFilterRule != filterRuleContent {
103+
t.Fatalf("expected %v, got %v", tc.ipFilterRule, filterRuleContent)
104+
}
101105
})
102106
}
103107
}

‎flowdesc/ip_filter_rule_test.go‎

Lines changed: 55 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ package flowdesc
66

77
import (
88
"testing"
9-
10-
"github.com/stretchr/testify/assert"
11-
"github.com/stretchr/testify/require"
129
)
1310

1411
func TestIPFilterRuleEncode(t *testing.T) {
@@ -20,32 +17,32 @@ func TestIPFilterRuleEncode(t *testing.T) {
2017
}
2118

2219
if err := rule.SetAction(Permit); err != nil {
23-
assert.Nil(t, err)
20+
t.Fatalf("unexpected error: %v", err)
2421
}
2522

2623
if err := rule.SetDirection(Out); err != nil {
27-
assert.Nil(t, err)
24+
t.Fatalf("unexpected error: %v", err)
2825
}
2926

3027
if err := rule.SetProtocol(0xfc); err != nil {
31-
assert.Nil(t, err)
28+
t.Fatalf("unexpected error: %v", err)
3229
}
3330

3431
if err := rule.SetSourceIP("any"); err != nil {
35-
assert.Nil(t, err)
32+
t.Fatalf("unexpected error: %v", err)
3633
}
3734

3835
if err := rule.SetDestinationIP("assigned"); err != nil {
39-
assert.Nil(t, err)
36+
t.Fatalf("unexpected error: %v", err)
4037
}
4138

4239
if err := rule.SetDestinationPorts("655"); err != nil {
43-
assert.Nil(t, err)
40+
t.Fatalf("unexpected error: %v", err)
4441
}
4542

4643
result, err := Encode(rule)
4744
if err != nil {
48-
assert.Nil(t, err)
45+
t.Fatalf("unexpected error: %v", err)
4946
}
5047
if result != testStr1 {
5148
t.Fatalf("Encode error, \n\t expect: %s,\n\t get: %s", testStr1, result)
@@ -128,16 +125,30 @@ func TestIPFilterRuleDecode(t *testing.T) {
128125
for testName, expected := range testCases {
129126
t.Run(testName, func(t *testing.T) {
130127
r, err := Decode(expected.filterRule)
131-
132-
require.Equal(t, expected.action, r.GetAction())
133-
require.Equal(t, expected.dir, r.GetDirection())
134-
require.Equal(t, expected.proto, r.GetProtocol())
135-
require.Equal(t, expected.src, r.GetSourceIP())
136-
require.Equal(t, expected.srcPorts, r.GetSourcePorts())
137-
require.Equal(t, expected.dst, r.GetDestinationIP())
138-
require.Equal(t, expected.dstPorts, r.GetDestinationPorts())
139-
140-
require.NoError(t, err)
128+
if expected.action != r.GetAction() {
129+
t.Fatalf("expected action %v, got %v", expected.action, r.GetAction())
130+
}
131+
if expected.dir != r.GetDirection() {
132+
t.Fatalf("expected direction %v, got %v", expected.dir, r.GetDirection())
133+
}
134+
if expected.proto != r.GetProtocol() {
135+
t.Fatalf("expected protocol %v, got %v", expected.proto, r.GetProtocol())
136+
}
137+
if expected.src != r.GetSourceIP() {
138+
t.Fatalf("expected source IP %v, got %v", expected.src, r.GetSourceIP())
139+
}
140+
if expected.srcPorts != r.GetSourcePorts() {
141+
t.Fatalf("expected source ports %v, got %v", expected.srcPorts, r.GetSourcePorts())
142+
}
143+
if expected.dst != r.GetDestinationIP() {
144+
t.Fatalf("expected destination IP %v, got %v", expected.dst, r.GetDestinationIP())
145+
}
146+
if expected.dstPorts != r.GetDestinationPorts() {
147+
t.Fatalf("expected destination ports %v, got %v", expected.dstPorts, r.GetDestinationPorts())
148+
}
149+
if err != nil {
150+
t.Fatalf("unexpected error: %v", err)
151+
}
141152
})
142153
}
143154
}
@@ -219,15 +230,30 @@ func TestIPFilterRuleSwapSourceAndDestination(t *testing.T) {
219230
t.Run(testName, func(t *testing.T) {
220231
r, err := Decode(expected.filterRule)
221232
r.SwapSourceAndDestination()
222-
require.Equal(t, expected.action, r.GetAction())
223-
require.Equal(t, expected.dir, r.GetDirection())
224-
require.Equal(t, expected.proto, r.GetProtocol())
225-
require.Equal(t, expected.src, r.GetSourceIP())
226-
require.Equal(t, expected.srcPorts, r.GetSourcePorts())
227-
require.Equal(t, expected.dst, r.GetDestinationIP())
228-
require.Equal(t, expected.dstPorts, r.GetDestinationPorts())
229-
230-
require.NoError(t, err)
233+
if expected.action != r.GetAction() {
234+
t.Fatalf("expected action %v, got %v", expected.action, r.GetAction())
235+
}
236+
if expected.dir != r.GetDirection() {
237+
t.Fatalf("expected direction %v, got %v", expected.dir, r.GetDirection())
238+
}
239+
if expected.proto != r.GetProtocol() {
240+
t.Fatalf("expected protocol %v, got %v", expected.proto, r.GetProtocol())
241+
}
242+
if expected.src != r.GetSourceIP() {
243+
t.Fatalf("expected source IP %v, got %v", expected.src, r.GetSourceIP())
244+
}
245+
if expected.srcPorts != r.GetSourcePorts() {
246+
t.Fatalf("expected source ports %v, got %v", expected.srcPorts, r.GetSourcePorts())
247+
}
248+
if expected.dst != r.GetDestinationIP() {
249+
t.Fatalf("expected destination IP %v, got %v", expected.dst, r.GetDestinationIP())
250+
}
251+
if expected.dstPorts != r.GetDestinationPorts() {
252+
t.Fatalf("expected destination ports %v, got %v", expected.dstPorts, r.GetDestinationPorts())
253+
}
254+
if err != nil {
255+
t.Fatalf("unexpected error: %v", err)
256+
}
231257
})
232258
}
233259
}

‎fsm/fsm_test.go‎

Lines changed: 46 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ import (
88
"context"
99
"fmt"
1010
"testing"
11-
12-
"github.com/stretchr/testify/assert"
1311
)
1412

1513
const (
@@ -25,13 +23,23 @@ const (
2523
func TestState(t *testing.T) {
2624
s := NewState(Closed)
2725

28-
assert.Equal(t, Closed, s.Current(), "Current() failed")
29-
assert.True(t, s.Is(Closed), "Is() failed")
26+
if s.Current() != Closed {
27+
t.Errorf("Current() failed: expected %v, got %v", Closed, s.Current())
28+
}
29+
30+
if !s.Is(Closed) {
31+
t.Error("Is() failed: expected true for Closed state")
32+
}
3033

3134
s.Set(Opened)
3235

33-
assert.Equal(t, Opened, s.Current(), "Current() failed")
34-
assert.True(t, s.Is(Opened), "Is() failed")
36+
if s.Current() != Opened {
37+
t.Errorf("Current() failed: expected %v, got %v", Opened, s.Current())
38+
}
39+
40+
if !s.Is(Opened) {
41+
t.Error("Is() failed: expected true for Opened state")
42+
}
3543
}
3644

3745
func TestFSM(t *testing.T) {
@@ -52,15 +60,29 @@ func TestFSM(t *testing.T) {
5260

5361
s := NewState(Closed)
5462

55-
assert.Nil(t, err, "NewFSM() failed")
63+
if err != nil {
64+
t.Errorf("NewFSM() failed: expected nil error, got %v", err)
65+
}
66+
67+
if err := f.SendEvent(ctx, s, Open, ArgsType{"TestArg": "test arg"}); err != nil {
68+
t.Errorf("SendEvent() failed: expected nil error, got %v", err)
69+
}
70+
71+
if err := f.SendEvent(ctx, s, Close, ArgsType{"TestArg": "test arg"}); err != nil {
72+
t.Errorf("SendEvent() failed: expected nil error, got %v", err)
73+
}
5674

57-
assert.Nil(t, f.SendEvent(ctx, s, Open, ArgsType{"TestArg": "test arg"}), "SendEvent() failed")
58-
assert.Nil(t, f.SendEvent(ctx, s, Close, ArgsType{"TestArg": "test arg"}), "SendEvent() failed")
59-
assert.True(t, s.Is(Closed), "Transition failed")
75+
if !s.Is(Closed) {
76+
t.Error("Transition failed: expected state to be Closed")
77+
}
6078

6179
fakeEvent := EventType("fake event")
62-
assert.EqualError(t, f.SendEvent(ctx, s, fakeEvent, nil),
63-
fmt.Sprintf("unknown transition[From: %s, Event: %s]", s.Current(), fakeEvent))
80+
expectedError := fmt.Sprintf("unknown transition[From: %s, Event: %s]", s.Current(), fakeEvent)
81+
if err := f.SendEvent(ctx, s, fakeEvent, nil); err == nil {
82+
t.Error("SendEvent() should have failed with fake event")
83+
} else if err.Error() != expectedError {
84+
t.Errorf("SendEvent() error mismatch: expected %q, got %q", expectedError, err.Error())
85+
}
6486
}
6587

6688
func TestFSMInitFail(t *testing.T) {
@@ -82,7 +104,12 @@ func TestFSMInitFail(t *testing.T) {
82104
},
83105
})
84106

85-
assert.EqualError(t, err, fmt.Sprintf("duplicate transition: %+v", duplicateTrans))
107+
expectedError := fmt.Sprintf("duplicate transition: %+v", duplicateTrans)
108+
if err == nil {
109+
t.Error("NewFSM() should have failed with duplicate transition")
110+
} else if err.Error() != expectedError {
111+
t.Errorf("NewFSM() error mismatch: expected %q, got %q", expectedError, err.Error())
112+
}
86113

87114
fakeState := StateType("fake state")
88115

@@ -103,5 +130,10 @@ func TestFSMInitFail(t *testing.T) {
103130
},
104131
})
105132

106-
assert.EqualError(t, err, fmt.Sprintf("unknown state: %+v", fakeState))
133+
expectedError = fmt.Sprintf("unknown state: %+v", fakeState)
134+
if err == nil {
135+
t.Error("NewFSM() should have failed with unknown state")
136+
} else if err.Error() != expectedError {
137+
t.Errorf("NewFSM() error mismatch: expected %q, got %q", expectedError, err.Error())
138+
}
107139
}

‎go.mod‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ go 1.24.0
55
require (
66
github.com/evanphx/json-patch/v5 v5.9.11
77
github.com/gin-gonic/gin v1.11.0
8-
github.com/stretchr/testify v1.11.1
98
go.mongodb.org/mongo-driver v1.17.4
109
go.uber.org/zap v1.27.0
1110
golang.org/x/net v0.46.0
@@ -15,7 +14,6 @@ require (
1514
github.com/bytedance/sonic v1.14.0 // indirect
1615
github.com/bytedance/sonic/loader v0.3.0 // indirect
1716
github.com/cloudwego/base64x v0.1.6 // indirect
18-
github.com/davecgh/go-spew v1.1.1 // indirect
1917
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
2018
github.com/gin-contrib/sse v1.1.0 // indirect
2119
github.com/go-playground/locales v0.14.1 // indirect
@@ -27,14 +25,12 @@ require (
2725
github.com/json-iterator/go v1.1.12 // indirect
2826
github.com/klauspost/compress v1.16.7 // indirect
2927
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
30-
github.com/kr/pretty v0.1.0 // indirect
3128
github.com/leodido/go-urn v1.4.0 // indirect
3229
github.com/mattn/go-isatty v0.0.20 // indirect
3330
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
3431
github.com/modern-go/reflect2 v1.0.2 // indirect
3532
github.com/montanaflynn/stats v0.7.1 // indirect
3633
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
37-
github.com/pmezard/go-difflib v1.0.0 // indirect
3834
github.com/quic-go/qpack v0.5.1 // indirect
3935
github.com/quic-go/quic-go v0.54.1 // indirect
4036
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
@@ -53,6 +49,4 @@ require (
5349
golang.org/x/text v0.30.0 // indirect
5450
golang.org/x/tools v0.37.0 // indirect
5551
google.golang.org/protobuf v1.36.9 // indirect
56-
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
57-
gopkg.in/yaml.v3 v3.0.1 // indirect
5852
)

‎go.sum‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,6 @@ github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGC
3838
github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
3939
github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y=
4040
github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
41-
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
42-
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
43-
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
44-
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
45-
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
46-
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
4741
github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
4842
github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
4943
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
@@ -138,8 +132,6 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
138132
google.golang.org/protobuf v1.36.9 h1:w2gp2mA27hUeUzj9Ex9FBjsBm40zfaDtEWow293U7Iw=
139133
google.golang.org/protobuf v1.36.9/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
140134
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
141-
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
142-
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
143135
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
144136
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
145137
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎httpwrapper/httpwrapper_test.go‎

Lines changed: 32 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,49 @@ import (
88
"context"
99
"net/http"
1010
"testing"
11-
12-
"github.com/stretchr/testify/assert"
1311
)
1412

1513
func TestNewRequest(t *testing.T) {
1614
req, err := http.NewRequestWithContext(context.Background(),
17-
"GET", "http://localhost:8080?name=NCTU&location=Hsinchu", nil)
15+
"GET", "http://localhost:8080?name=Aether&location=USA", nil)
1816
if err != nil {
1917
t.Errorf("TestNewRequest error: %+v", err)
2018
}
21-
req.Header.Set("Location", "https://www.nctu.edu.tw/")
19+
req.Header.Set("Location", "https://aetherproject.org/")
2220
request := NewRequest(req, 1000)
23-
assert.Equal(t, "https://www.nctu.edu.tw/", request.Header.Get("Location"))
24-
assert.Equal(t, "NCTU", request.Query.Get("name"))
25-
assert.Equal(t, "Hsinchu", request.Query.Get("location"))
26-
assert.Equal(t, 1000, request.Body)
21+
22+
if got := request.Header.Get("Location"); got != "https://aetherproject.org/" {
23+
t.Errorf("Header.Get(\"Location\") = %q, want %q", got, "https://aetherproject.org/")
24+
}
25+
26+
if got := request.Query.Get("name"); got != "Aether" {
27+
t.Errorf("Query.Get(\"name\") = %q, want %q", got, "Aether")
28+
}
29+
30+
if got := request.Query.Get("location"); got != "USA" {
31+
t.Errorf("Query.Get(\"location\") = %q, want %q", got, "USA")
32+
}
33+
34+
if got := request.Body; got != 1000 {
35+
t.Errorf("Body = %v, want %v", got, 1000)
36+
}
2737
}
2838

2939
func TestNewResponse(t *testing.T) {
3040
response := NewResponse(http.StatusCreated, map[string][]string{
31-
"Location": {"https://www.nctu.edu.tw/"},
32-
"Refresh": {"url=https://free5gc.org"},
41+
"Location": {"https://aetherproject.org/"},
42+
"Refresh": {"url=https://docs.sd-core.opennetworking.org"},
3343
}, 1000)
34-
assert.Equal(t, "https://www.nctu.edu.tw/", response.Header.Get("Location"))
35-
assert.Equal(t, "url=https://free5gc.org", response.Header.Get("Refresh"))
36-
assert.Equal(t, 1000, response.Body)
44+
45+
if got := response.Header.Get("Location"); got != "https://aetherproject.org/" {
46+
t.Errorf("Header.Get(\"Location\") = %q, want %q", got, "https://aetherproject.org/")
47+
}
48+
49+
if got := response.Header.Get("Refresh"); got != "url=https://docs.sd-core.opennetworking.org" {
50+
t.Errorf("Header.Get(\"Refresh\") = %q, want %q", got, "url=https://docs.sd-core.opennetworking.org")
51+
}
52+
53+
if got := response.Body; got != 1000 {
54+
t.Errorf("Body = %v, want %v", got, 1000)
55+
}
3756
}

0 commit comments

Comments
 (0)