Skip to content

Commit beb721f

Browse files
committed
Use subtests
1 parent c2fcd44 commit beb721f

File tree

1 file changed

+27
-18
lines changed

1 file changed

+27
-18
lines changed

traverse_test.go

+27-18
Original file line numberDiff line numberDiff line change
@@ -234,28 +234,37 @@ var tests = []networkTest{
234234
func TestNetworksWithin(t *testing.T) {
235235
for _, v := range tests {
236236
for _, recordSize := range []uint{24, 28, 32} {
237-
fileName := testFile(fmt.Sprintf("MaxMind-DB-test-%s-%d.mmdb", v.Database, recordSize))
238-
reader, err := Open(fileName)
239-
require.NoError(t, err, "unexpected error while opening database: %v", err)
240-
241-
_, network, err := net.ParseCIDR(v.Network)
242-
require.NoError(t, err)
243-
n := reader.NetworksWithin(network, v.Options...)
244-
var innerIPs []string
237+
name := fmt.Sprintf(
238+
"%s-%d: %s, options: %v",
239+
v.Database,
240+
recordSize,
241+
v.Network,
242+
len(v.Options) != 0,
243+
)
244+
t.Run(name, func(t *testing.T) {
245+
fileName := testFile(fmt.Sprintf("MaxMind-DB-test-%s-%d.mmdb", v.Database, recordSize))
246+
reader, err := Open(fileName)
247+
require.NoError(t, err, "unexpected error while opening database: %v", err)
245248

246-
for n.Next() {
247-
record := struct {
248-
IP string `maxminddb:"ip"`
249-
}{}
250-
network, err := n.Network(&record)
249+
_, network, err := net.ParseCIDR(v.Network)
251250
require.NoError(t, err)
252-
innerIPs = append(innerIPs, network.String())
253-
}
251+
n := reader.NetworksWithin(network, v.Options...)
252+
var innerIPs []string
254253

255-
assert.Equal(t, v.Expected, innerIPs)
256-
require.NoError(t, n.Err())
254+
for n.Next() {
255+
record := struct {
256+
IP string `maxminddb:"ip"`
257+
}{}
258+
network, err := n.Network(&record)
259+
require.NoError(t, err)
260+
innerIPs = append(innerIPs, network.String())
261+
}
257262

258-
require.NoError(t, reader.Close())
263+
assert.Equal(t, v.Expected, innerIPs)
264+
require.NoError(t, n.Err())
265+
266+
require.NoError(t, reader.Close())
267+
})
259268
}
260269
}
261270
}

0 commit comments

Comments
 (0)