Skip to content

Commit 5a8403f

Browse files
gab-arrobogab-arrobo
authored
Refactor tests and remove github.com/stretchr/testify package (#191)
Signed-off-by: Arrobo, Gabriel <[email protected]>
1 parent 84d18e7 commit 5a8403f

File tree

9 files changed

+138
-40
lines changed

9 files changed

+138
-40
lines changed

‎.gitignore‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,33 @@
22
# Copyright 2022-present Open Networking Foundation
33

44
.fuzz/test_data
5+
6+
# Toolchain
7+
# Goland project folder
58
.idea/
6-
.coverage/
9+
# Visual Studio Code
10+
.vscode/
11+
# emacs/vim
12+
GPATH
13+
GRTAGS
14+
GTAGS
15+
TAGS
16+
tags
17+
cscope.*
18+
# mac
19+
.DS_Store
20+
21+
# debug
722
output
823
*.pyc
924
*.swp
1025
*.log
26+
*.pcap
27+
vendor*
28+
*.patch
29+
30+
# coverage
31+
.coverage/
32+
1133
client
1234
server

‎fuzz/ie_fuzz_test.go‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212

1313
"github.com/omec-project/pfcpsim/internal/pfcpsim/export"
1414
"github.com/omec-project/pfcpsim/pkg/pfcpsim/session"
15-
"github.com/stretchr/testify/require"
1615
)
1716

1817
const (
@@ -37,7 +36,7 @@ var (
3736

3837
func Fuzz(f *testing.F) {
3938
var testcases []uint
40-
for i := 0; i < 100; i++ {
39+
for range 100 {
4140
testcases = append(testcases, uint(getRand(MaxInt)))
4241
}
4342

@@ -54,17 +53,19 @@ func Fuzz(f *testing.F) {
5453

5554
err := sim.InitPFCPSim()
5655
if err != nil {
57-
require.NoError(t, err, "InitPFCPSim failed")
56+
t.Fatalf("InitPFCPSim failed: %v", err)
5857
}
5958

6059
err = sim.Associate()
6160
if err != nil {
62-
require.NoError(t, err, "Associate failed")
61+
t.Fatalf("Associate failed: %v", err)
6362
}
6463

6564
defer func() {
6665
err = sim.TerminatePFCPSim()
67-
require.NoError(t, err)
66+
if err != nil {
67+
t.Errorf("TerminatePFCPSim failed: %v", err)
68+
}
6869
}()
6970

7071
err = sim.CreateSession(2, getRand(session.PdrMax),
@@ -73,22 +74,22 @@ func Fuzz(f *testing.F) {
7374
int(input)%session.UrrMax,
7475
input)
7576
if err != nil {
76-
require.NoError(t, err, "CreateSession failed")
77+
t.Fatalf("CreateSession failed: %v", err)
7778
}
7879

7980
err = sim.ModifySession(2,
8081
getRand(session.FarMax),
8182
getRand(session.UrrMax),
8283
input)
8384
if err != nil {
84-
require.NoError(t, err, "ModifySession failed")
85+
t.Fatalf("ModifySession failed: %v", err)
8586
}
8687

8788
time.Sleep(3 * time.Second)
8889

8990
err = sim.DeleteSession(2)
9091
if err != nil {
91-
require.NoError(t, err, "DeleteSession failed")
92+
t.Fatalf("DeleteSession failed: %v", err)
9293
}
9394
})
9495
}

‎go.mod‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ module github.com/omec-project/pfcpsim
33
go 1.24.0
44

55
require (
6-
github.com/stretchr/testify v1.11.1
76
github.com/urfave/cli/v3 v3.4.1
87
github.com/wmnsk/go-pfcp v0.0.24
98
go.uber.org/zap v1.27.0
@@ -12,12 +11,10 @@ require (
1211
)
1312

1413
require (
15-
github.com/davecgh/go-spew v1.1.1 // indirect
16-
github.com/pmezard/go-difflib v1.0.0 // indirect
14+
github.com/stretchr/testify v1.11.1 // indirect
1715
go.uber.org/multierr v1.11.0 // indirect
1816
golang.org/x/net v0.42.0 // indirect
1917
golang.org/x/sys v0.34.0 // indirect
2018
golang.org/x/text v0.27.0 // indirect
2119
google.golang.org/genproto/googleapis/rpc v0.0.0-20250804133106-a7a43d27e69b // indirect
22-
gopkg.in/yaml.v3 v3.0.1 // indirect
2320
)

‎go.sum‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,5 @@ google.golang.org/grpc v1.76.0 h1:UnVkv1+uMLYXoIz6o7chp59WfQUYA2ex/BXQ9rHZu7A=
5050
google.golang.org/grpc v1.76.0/go.mod h1:Ju12QI8M6iQJtbcsV+awF5a4hfJMLi4X0JLo94ULZ6c=
5151
google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
5252
google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
53-
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
54-
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
5553
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
5654
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎internal/pfcpsim/helpers_test.go‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package pfcpsim
66
import (
77
"testing"
88

9-
"github.com/stretchr/testify/require"
109
"github.com/wmnsk/go-pfcp/ie"
1110
)
1211

@@ -132,13 +131,27 @@ func Test_ParseAppFilter(t *testing.T) {
132131
tt.name, func(t *testing.T) {
133132
filter, gateStatus, precedence, err := ParseAppFilter(tt.args.filterString)
134133
if tt.wantErr {
135-
require.Error(t, err)
134+
if err == nil {
135+
t.Fatal("Expected error but got none")
136+
}
136137
return
137138
}
138139

139-
require.Equal(t, tt.want.SDFFilter, filter)
140-
require.Equal(t, tt.want.gateStatus, gateStatus)
141-
require.Equal(t, tt.want.precedence, precedence)
140+
if err != nil {
141+
t.Fatalf("Unexpected error: %v", err)
142+
}
143+
144+
if filter != tt.want.SDFFilter {
145+
t.Errorf("SDFFilter mismatch. got = %v, want = %v", filter, tt.want.SDFFilter)
146+
}
147+
148+
if gateStatus != tt.want.gateStatus {
149+
t.Errorf("gateStatus mismatch. got = %v, want = %v", gateStatus, tt.want.gateStatus)
150+
}
151+
152+
if precedence != tt.want.precedence {
153+
t.Errorf("precedence mismatch. got = %v, want = %v", precedence, tt.want.precedence)
154+
}
142155
},
143156
)
144157
}

‎pkg/pfcpsim/session/far_builder_test.go‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44
package session
55

66
import (
7+
"reflect"
78
"testing"
89

9-
"github.com/stretchr/testify/assert"
10-
"github.com/stretchr/testify/require"
1110
"github.com/wmnsk/go-pfcp/ie"
1211
)
1312

@@ -78,8 +77,16 @@ func TestFARBuilderShouldPanic(t *testing.T) {
7877
},
7978
} {
8079
t.Run(scenario.description, func(t *testing.T) {
81-
assert.Panics(t, func() { scenario.input.BuildFAR() })
82-
assert.Equal(t, scenario.input, scenario.expected)
80+
defer func() {
81+
if r := recover(); r == nil {
82+
t.Error("Expected Build() to panic, but it didn't")
83+
}
84+
}()
85+
scenario.input.BuildFAR()
86+
87+
if !reflect.DeepEqual(scenario.input, scenario.expected) {
88+
t.Errorf("QER builder mismatch. got = %+v, want = %+v", scenario.input, scenario.expected)
89+
}
8390
})
8491
}
8592
}
@@ -142,7 +149,10 @@ func TestFARBuilder(t *testing.T) {
142149
},
143150
} {
144151
t.Run(scenario.description, func(t *testing.T) {
145-
require.Equal(t, scenario.expected, scenario.input.BuildFAR())
152+
got := scenario.input.BuildFAR()
153+
if !reflect.DeepEqual(got, scenario.expected) {
154+
t.Errorf("BuildFAR() result mismatch. got = %+v, want = %+v", got, scenario.expected)
155+
}
146156
})
147157
}
148158
}

‎pkg/pfcpsim/session/pdr_builder_test.go‎

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ package session
55

66
import (
77
"net"
8+
"reflect"
89
"testing"
910

10-
"github.com/stretchr/testify/assert"
1111
"github.com/wmnsk/go-pfcp/ie"
1212
)
1313

@@ -86,8 +86,16 @@ func TestPDRBuilderShouldPanic(t *testing.T) {
8686
},
8787
} {
8888
t.Run(scenario.description, func(t *testing.T) {
89-
assert.Panics(t, func() { scenario.input.BuildPDR() })
90-
assert.Equal(t, scenario.expected, scenario.input)
89+
defer func() {
90+
if r := recover(); r == nil {
91+
t.Error("Expected Build() to panic, but it didn't")
92+
}
93+
}()
94+
scenario.input.BuildPDR()
95+
96+
if !reflect.DeepEqual(scenario.input, scenario.expected) {
97+
t.Errorf("QER builder mismatch. got = %+v, want = %+v", scenario.input, scenario.expected)
98+
}
9199
})
92100
}
93101
}
@@ -197,8 +205,19 @@ func TestPDRBuilder(t *testing.T) {
197205
},
198206
} {
199207
t.Run(scenario.description, func(t *testing.T) {
200-
assert.NotPanics(t, func() { scenario.input.BuildPDR() })
201-
assert.Equal(t, scenario.expected, scenario.input.BuildPDR())
208+
var result *ie.IE
209+
func() {
210+
defer func() {
211+
if r := recover(); r != nil {
212+
t.Errorf("Build() panicked unexpectedly: %v", r)
213+
}
214+
}()
215+
result = scenario.input.BuildPDR()
216+
}()
217+
218+
if !reflect.DeepEqual(result, scenario.expected) {
219+
t.Errorf("QER build result mismatch. got = %+v, want = %+v", result, scenario.expected)
220+
}
202221
})
203222
}
204223
}

‎pkg/pfcpsim/session/qer_builder_test.go‎

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
package session
55

66
import (
7+
"reflect"
78
"testing"
89

9-
"github.com/stretchr/testify/assert"
1010
"github.com/wmnsk/go-pfcp/ie"
1111
)
1212

@@ -30,8 +30,16 @@ func TestQERBuilderShouldPanic(t *testing.T) {
3030
},
3131
} {
3232
t.Run(scenario.description, func(t *testing.T) {
33-
assert.Panics(t, func() { scenario.input.Build() })
34-
assert.Equal(t, scenario.input, scenario.expected)
33+
defer func() {
34+
if r := recover(); r == nil {
35+
t.Error("Expected Build() to panic, but it didn't")
36+
}
37+
}()
38+
scenario.input.Build()
39+
40+
if !reflect.DeepEqual(scenario.input, scenario.expected) {
41+
t.Errorf("QER builder mismatch. got = %+v, want = %+v", scenario.input, scenario.expected)
42+
}
3543
})
3644
}
3745
}
@@ -103,8 +111,19 @@ func TestQERBuilder(t *testing.T) {
103111
},
104112
} {
105113
t.Run(scenario.description, func(t *testing.T) {
106-
assert.NotPanics(t, func() { _ = scenario.input.Build() })
107-
assert.Equal(t, scenario.input.Build(), scenario.expected)
114+
var result *ie.IE
115+
func() {
116+
defer func() {
117+
if r := recover(); r != nil {
118+
t.Errorf("Build() panicked unexpectedly: %v", r)
119+
}
120+
}()
121+
result = scenario.input.Build()
122+
}()
123+
124+
if !reflect.DeepEqual(result, scenario.expected) {
125+
t.Errorf("QER build result mismatch. got = %+v, want = %+v", result, scenario.expected)
126+
}
108127
})
109128
}
110129
}

‎pkg/pfcpsim/session/urr_build_test.go‎

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
package session
55

66
import (
7+
"reflect"
78
"testing"
89
"time"
910

10-
"github.com/stretchr/testify/assert"
1111
"github.com/wmnsk/go-pfcp/ie"
1212
)
1313

@@ -47,8 +47,16 @@ func TestURRBuilderShouldPanic(t *testing.T) {
4747
},
4848
} {
4949
t.Run(scenario.description, func(t *testing.T) {
50-
assert.Panics(t, func() { scenario.input.Build() })
51-
assert.Equal(t, scenario.input, scenario.expected)
50+
defer func() {
51+
if r := recover(); r == nil {
52+
t.Error("Expected Build() to panic, but it didn't")
53+
}
54+
}()
55+
scenario.input.Build()
56+
57+
if !reflect.DeepEqual(scenario.input, scenario.expected) {
58+
t.Errorf("QER builder mismatch. got = %+v, want = %+v", scenario.input, scenario.expected)
59+
}
5260
})
5361
}
5462
}
@@ -114,8 +122,19 @@ func TestURRBuilder(t *testing.T) {
114122
},
115123
} {
116124
t.Run(scenario.description, func(t *testing.T) {
117-
assert.NotPanics(t, func() { _ = scenario.input.Build() })
118-
assert.Equal(t, scenario.expected, scenario.input.Build())
125+
var result *ie.IE
126+
func() {
127+
defer func() {
128+
if r := recover(); r != nil {
129+
t.Errorf("Build() panicked unexpectedly: %v", r)
130+
}
131+
}()
132+
result = scenario.input.Build()
133+
}()
134+
135+
if !reflect.DeepEqual(result, scenario.expected) {
136+
t.Errorf("QER build result mismatch. got = %+v, want = %+v", result, scenario.expected)
137+
}
119138
})
120139
}
121140
}

0 commit comments

Comments
 (0)