Add more NetworksWithin() tests

Author: Olaf Alders

traverse_test.go

@@ -67,6 +67,14 @@ var tests = []networkTest{
 			"1.1.1.32/32",
 		},
 	},
+	networkTest{
+		Network:  "1.1.1.1/30",
+		Database: "ipv4",
+		Expected: []string{
+			"1.1.1.1/32",
+			"1.1.1.2/31",
+		},
+	},
 	networkTest{
 		Network:  "1.1.1.1/32",
 		Database: "ipv4",
@@ -99,6 +107,15 @@ var tests = []networkTest{
 			"::2:0:58/127",
 		},
 	},
+	networkTest{
+		Network:  "::2:0:40/123",
+		Database: "ipv6",
+		Expected: []string{
+			"::2:0:40/124",
+			"::2:0:50/125",
+			"::2:0:58/127",
+		},
+	},
 	networkTest{
 		Network:  "0.0.0.0/0",
 		Database: "mixed",
@@ -111,6 +128,13 @@ var tests = []networkTest{
 			"1.1.1.32/32",
 		},
 	},
+	networkTest{
+		Network:  "1.1.1.16/28",
+		Database: "mixed",
+		Expected: []string{
+			"1.1.1.16/28",
+		},
+	},
 	networkTest{
 		Network:  "::/0",
 		Database: "ipv4",
@@ -123,6 +147,13 @@ var tests = []networkTest{
 			"101:120::/32",
 		},
 	},
+	networkTest{
+		Network:  "101:104::/30",
+		Database: "ipv4",
+		Expected: []string{
+			"101:104::/30",
+		},
+	},
 }
 
 func TestNetworksWithin(t *testing.T) {
@@ -152,3 +183,41 @@ func TestNetworksWithin(t *testing.T) {
 		}
 	}
 }
+
+var geoIPTests = []networkTest{
+	networkTest{
+		Network:  "81.2.69.128/26",
+		Database: "GeoIP2-Country-Test.mmdb",
+		Expected: []string{
+			"81.2.69.142/31",
+			"81.2.69.144/28",
+			"81.2.69.160/27",
+		},
+	},
+}
+
+func TestGeoIPNetworksWithin(t *testing.T) {
+	for _, v := range geoIPTests {
+		fileName := testFile(v.Database)
+		reader, err := Open(fileName)
+		require.Nil(t, err, "unexpected error while opening database: %v", err)
+		defer reader.Close()
+
+		_, network, err := net.ParseCIDR(v.Network)
+		assert.Nil(t, err)
+		n := reader.NetworksWithin(network)
+		var innerIPs []string
+
+		for n.Next() {
+			record := struct {
+				IP string `maxminddb:"ip"`
+			}{}
+			network, err := n.Network(&record)
+			assert.Nil(t, err)
+			innerIPs = append(innerIPs, network.String())
+		}
+
+		assert.Equal(t, v.Expected, innerIPs)
+		assert.Nil(t, n.Err())
+	}
+}