update tests to handle current version MMDB files and use of submodule (#7)

gregorybrzeski · web-flow · commit 98c4e5617d1c · 2025-01-28T18:33:36.000+03:00
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "testdata/maxmind"]
+	path = testdata/maxmind
+	url = https://github.com/maxmind/MaxMind-DB
diff --git a/README.md b/README.md
@@ -89,6 +89,23 @@ connection_type_parallel-24    34284831    32.1 ns/op     32 B/op     2 allocs/o
 ### Domain
 - GeoIP2-Domain
 
+## MMDB files for tests
+
+MMDB files for tests are organised in their respective directories based on the source within the `testdata` repository root directory.
+
+### MaxMind
+
+These are obtained using a submodule into a `testdata/maxmind` directory.
+
+```
+git submodule init
+git submodule update
+```
+
+### DB-IP
+
+You must obtain these files manually and place them into the `testdata/dbip` directory.
+
 ## License
 
 [MIT License](LICENSE).
diff --git a/geoip2_test.go b/geoip2_test.go
@@ -6,17 +6,17 @@ import (
 )
 
 func TestReader(t *testing.T) {
-	ip := net.ParseIP("81.2.69.142")
+	ip := net.ParseIP("81.2.69.160")
 
-	countryReader, err := NewCountryReaderFromFile("testdata/GeoIP2-Country.mmdb")
+	countryReader, err := NewCountryReaderFromFile("testdata/maxmind/test-data/GeoIP2-Country-Test.mmdb")
 	if err != nil {
 		t.Fatal(err)
 	}
 	_, err = countryReader.Lookup(ip)
 	if err != nil {
 		t.Fatal(err)
 	}
-	countryLiteReader, err := NewCountryReaderFromFile("testdata/GeoLite2-Country.mmdb")
+	countryLiteReader, err := NewCountryReaderFromFile("testdata/maxmind/test-data/GeoLite2-Country-Test.mmdb")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -25,15 +25,15 @@ func TestReader(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	cityReader, err := NewCityReaderFromFile("testdata/GeoIP2-City.mmdb")
+	cityReader, err := NewCityReaderFromFile("testdata/maxmind/test-data/GeoIP2-City-Test.mmdb")
 	if err != nil {
 		t.Fatal(err)
 	}
 	_, err = cityReader.Lookup(ip)
 	if err != nil {
 		t.Fatal(err)
 	}
-	cityLiteReader, err := NewCityReaderFromFile("testdata/GeoLite2-City.mmdb")
+	cityLiteReader, err := NewCityReaderFromFile("testdata/maxmind/test-data/GeoLite2-City-Test.mmdb")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -42,7 +42,7 @@ func TestReader(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	ispReader, err := NewISPReaderFromFile("testdata/GeoIP2-ISP.mmdb")
+	ispReader, err := NewISPReaderFromFile("testdata/maxmind/test-data/GeoIP2-ISP-Test.mmdb")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -51,7 +51,8 @@ func TestReader(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	connectionTypeReader, err := NewConnectionTypeReaderFromFile("testdata/GeoIP2-Connection-Type.mmdb")
+	ip = net.ParseIP("2.125.160.216")
+	connectionTypeReader, err := NewConnectionTypeReaderFromFile("testdata/maxmind/test-data/GeoIP2-Connection-Type-Test.mmdb")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -60,7 +61,8 @@ func TestReader(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	asnReader, err := NewASNReaderFromFile("testdata/GeoLite2-ASN.mmdb")
+	ip = net.ParseIP("81.128.69.160")
+	asnReader, err := NewASNReaderFromFile("testdata/maxmind/test-data/GeoLite2-ASN-Test.mmdb")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -75,7 +77,7 @@ func BenchmarkGeoIP2(b *testing.B) {
 	b.ReportAllocs()
 
 	b.Run("country", func(b *testing.B) {
-		reader, err := NewCountryReaderFromFile("testdata/GeoIP2-Country.mmdb")
+		reader, err := NewCountryReaderFromFile("testdata/maxmind/test-data/GeoIP2-Country-Test.mmdb")
 		if err != nil {
 			b.Fatal(err)
 		}
@@ -94,7 +96,7 @@ func BenchmarkGeoIP2(b *testing.B) {
 	})
 
 	b.Run("city", func(b *testing.B) {
-		reader, err := NewCityReaderFromFile("testdata/GeoIP2-City.mmdb")
+		reader, err := NewCityReaderFromFile("testdata/maxmind/test-data/GeoIP2-City-Test.mmdb")
 		if err != nil {
 			b.Fatal(err)
 		}
@@ -113,7 +115,7 @@ func BenchmarkGeoIP2(b *testing.B) {
 	})
 
 	b.Run("isp", func(b *testing.B) {
-		reader, err := NewISPReaderFromFile("testdata/GeoIP2-ISP.mmdb")
+		reader, err := NewISPReaderFromFile("testdata/maxmind/test-data/GeoIP2-ISP-Test.mmdb")
 		if err != nil {
 			b.Fatal(err)
 		}
@@ -132,7 +134,7 @@ func BenchmarkGeoIP2(b *testing.B) {
 	})
 
 	b.Run("connection_type", func(b *testing.B) {
-		reader, err := NewConnectionTypeReaderFromFile("testdata/GeoIP2-Connection-Type.mmdb")
+		reader, err := NewConnectionTypeReaderFromFile("testdata/maxmind/test-data/GeoIP2-Connection-Type-Test.mmdb")
 		if err != nil {
 			b.Fatal(err)
 		}
@@ -151,7 +153,7 @@ func BenchmarkGeoIP2(b *testing.B) {
 	})
 
 	b.Run("asn", func(b *testing.B) {
-		reader, err := NewASNReaderFromFile("testdata/GeoLite2-ASN.mmdb")
+		reader, err := NewASNReaderFromFile("testdata/maxmind/test-data/GeoLite2-ASN-Test.mmdb")
 		if err != nil {
 			b.Fatal(err)
 		}
diff --git a/reader_test.go b/reader_test.go
@@ -9,7 +9,7 @@ import (
 )
 
 func TestAnonymousIP(t *testing.T) {
-	reader, err := NewAnonymousIPReaderFromFile("testdata/GeoIP2-Anonymous-IP-Test.mmdb")
+	reader, err := NewAnonymousIPReaderFromFile("testdata/maxmind/test-data/GeoIP2-Anonymous-IP-Test.mmdb")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -63,7 +63,7 @@ func TestReaderZeroLength(t *testing.T) {
 }
 
 func TestCity(t *testing.T) {
-	reader, err := NewCityReaderFromFile("testdata/GeoIP2-City-Test.mmdb")
+	reader, err := NewCityReaderFromFile("testdata/maxmind/test-data/GeoIP2-City-Test.mmdb")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -133,7 +133,7 @@ func TestCity(t *testing.T) {
 }
 
 func TestConnectionType(t *testing.T) {
-	reader, err := NewConnectionTypeReaderFromFile("testdata/GeoIP2-Connection-Type-Test.mmdb")
+	reader, err := NewConnectionTypeReaderFromFile("testdata/maxmind/test-data/GeoIP2-Connection-Type-Test.mmdb")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -142,21 +142,21 @@ func TestConnectionType(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if record != "Dialup" {
+	if record != "Cable/DSL" {
 		t.Fatal()
 	}
 
 	record, err = reader.Lookup(net.ParseIP("1.0.1.0"))
 	if err != nil {
 		t.Fatal(err)
 	}
-	if record != "Cable/DSL" {
+	if record != "Cellular" {
 		t.Fatal()
 	}
 }
 
 func TestCountry(t *testing.T) {
-	reader, err := NewCountryReaderFromFile("testdata/GeoIP2-Country-Test.mmdb")
+	reader, err := NewCountryReaderFromFile("testdata/maxmind/test-data/GeoIP2-Country-Test.mmdb")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -240,7 +240,7 @@ func TestCountry(t *testing.T) {
 }
 
 func TestDomain(t *testing.T) {
-	reader, err := NewDomainReaderFromFile("testdata/GeoIP2-Domain-Test.mmdb")
+	reader, err := NewDomainReaderFromFile("testdata/maxmind/test-data/GeoIP2-Domain-Test.mmdb")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -263,7 +263,7 @@ func TestDomain(t *testing.T) {
 }
 
 func TestEnterprise(t *testing.T) {
-	reader, err := NewEnterpriseReaderFromFile("testdata/GeoIP2-Enterprise-Test.mmdb")
+	reader, err := NewEnterpriseReaderFromFile("testdata/maxmind/test-data/GeoIP2-Enterprise-Test.mmdb")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -340,7 +340,7 @@ func TestEnterprise(t *testing.T) {
 }
 
 func TestISP(t *testing.T) {
-	reader, err := NewISPReaderFromFile("testdata/GeoIP2-ISP-Test.mmdb")
+	reader, err := NewISPReaderFromFile("testdata/maxmind/test-data/GeoIP2-ISP-Test.mmdb")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -381,7 +381,7 @@ func TestISP(t *testing.T) {
 }
 
 func TestASN(t *testing.T) {
-	reader, err := NewASNReaderFromFile("testdata/GeoLite2-ASN-Test.mmdb")
+	reader, err := NewASNReaderFromFile("testdata/maxmind/test-data/GeoLite2-ASN-Test.mmdb")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -410,7 +410,7 @@ func TestASN(t *testing.T) {
 }
 
 func TestDBIPCity(t *testing.T) {
-	reader, err := NewCityReaderFromFile("testdata/dbip-city-lite.mmdb")
+	reader, err := NewCityReaderFromFile("testdata/dbip/dbip-city-lite.mmdb")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -421,13 +421,13 @@ func TestDBIPCity(t *testing.T) {
 	if record.City.GeoNameID != 0 {
 		t.Fatal()
 	}
-	if record.City.Names["en"] != "Boston" {
+	if record.City.Names["en"] != "Medfield" {
 		t.Fatal()
 	}
-	if record.Location.Latitude != 42.3601 {
+	if record.Location.Latitude != 42.1876 {
 		t.Fatal()
 	}
-	if record.Location.Longitude != -71.0589 {
+	if record.Location.Longitude != -71.3065 {
 		t.Fatal()
 	}
 	if len(record.Subdivisions) != 1 {
@@ -439,7 +439,7 @@ func TestDBIPCity(t *testing.T) {
 }
 
 func TestDBIPCountry(t *testing.T) {
-	reader, err := NewCountryReaderFromFile("testdata/dbip-country-lite.mmdb")
+	reader, err := NewCountryReaderFromFile("testdata/dbip/dbip-country-lite.mmdb")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -473,7 +473,7 @@ func TestDBIPCountry(t *testing.T) {
 }
 
 func TestDBIPASN(t *testing.T) {
-	reader, err := NewASNReaderFromFile("testdata/dbip-asn-lite.mmdb")
+	reader, err := NewASNReaderFromFile("testdata/dbip/dbip-asn-lite.mmdb")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/testdata/maxmind b/testdata/maxmind
@@ -0,0 +1 @@
+Subproject commit fb053bcc11686a74fb80f1ede7429f6e5701544d

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[submodule "testdata/maxmind"]`
	`2`	`+ path = testdata/maxmind`
	`3`	`+ url = https://github.com/maxmind/MaxMind-DB`
Original file line number	Diff line number	Diff line change
`@@ -6,17 +6,17 @@ import (`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`func TestReader(t *testing.T) {`
`9`		`- ip := net.ParseIP("81.2.69.142")`
	`9`	`+ ip := net.ParseIP("81.2.69.160")`
`10`	`10`
`11`		`- countryReader, err := NewCountryReaderFromFile("testdata/GeoIP2-Country.mmdb")`
	`11`	`+ countryReader, err := NewCountryReaderFromFile("testdata/maxmind/test-data/GeoIP2-Country-Test.mmdb")`
`12`	`12`	`if err != nil {`
`13`	`13`	`t.Fatal(err)`
`14`	`14`	`}`
`15`	`15`	`_, err = countryReader.Lookup(ip)`
`16`	`16`	`if err != nil {`
`17`	`17`	`t.Fatal(err)`
`18`	`18`	`}`
`19`		`- countryLiteReader, err := NewCountryReaderFromFile("testdata/GeoLite2-Country.mmdb")`
	`19`	`+ countryLiteReader, err := NewCountryReaderFromFile("testdata/maxmind/test-data/GeoLite2-Country-Test.mmdb")`
`20`	`20`	`if err != nil {`
`21`	`21`	`t.Fatal(err)`
`22`	`22`	`}`
`@@ -25,15 +25,15 @@ func TestReader(t *testing.T) {`
`25`	`25`	`t.Fatal(err)`
`26`	`26`	`}`
`27`	`27`
`28`		`- cityReader, err := NewCityReaderFromFile("testdata/GeoIP2-City.mmdb")`
	`28`	`+ cityReader, err := NewCityReaderFromFile("testdata/maxmind/test-data/GeoIP2-City-Test.mmdb")`
`29`	`29`	`if err != nil {`
`30`	`30`	`t.Fatal(err)`
`31`	`31`	`}`
`32`	`32`	`_, err = cityReader.Lookup(ip)`
`33`	`33`	`if err != nil {`
`34`	`34`	`t.Fatal(err)`
`35`	`35`	`}`
`36`		`- cityLiteReader, err := NewCityReaderFromFile("testdata/GeoLite2-City.mmdb")`
	`36`	`+ cityLiteReader, err := NewCityReaderFromFile("testdata/maxmind/test-data/GeoLite2-City-Test.mmdb")`
`37`	`37`	`if err != nil {`
`38`	`38`	`t.Fatal(err)`
`39`	`39`	`}`
`@@ -42,7 +42,7 @@ func TestReader(t *testing.T) {`
`42`	`42`	`t.Fatal(err)`
`43`	`43`	`}`
`44`	`44`
`45`		`- ispReader, err := NewISPReaderFromFile("testdata/GeoIP2-ISP.mmdb")`
	`45`	`+ ispReader, err := NewISPReaderFromFile("testdata/maxmind/test-data/GeoIP2-ISP-Test.mmdb")`
`46`	`46`	`if err != nil {`
`47`	`47`	`t.Fatal(err)`
`48`	`48`	`}`
`@@ -51,7 +51,8 @@ func TestReader(t *testing.T) {`
`51`	`51`	`t.Fatal(err)`
`52`	`52`	`}`
`53`	`53`
`54`		`- connectionTypeReader, err := NewConnectionTypeReaderFromFile("testdata/GeoIP2-Connection-Type.mmdb")`
	`54`	`+ ip = net.ParseIP("2.125.160.216")`
	`55`	`+ connectionTypeReader, err := NewConnectionTypeReaderFromFile("testdata/maxmind/test-data/GeoIP2-Connection-Type-Test.mmdb")`
`55`	`56`	`if err != nil {`
`56`	`57`	`t.Fatal(err)`
`57`	`58`	`}`
`@@ -60,7 +61,8 @@ func TestReader(t *testing.T) {`
`60`	`61`	`t.Fatal(err)`
`61`	`62`	`}`
`62`	`63`
`63`		`- asnReader, err := NewASNReaderFromFile("testdata/GeoLite2-ASN.mmdb")`
	`64`	`+ ip = net.ParseIP("81.128.69.160")`
	`65`	`+ asnReader, err := NewASNReaderFromFile("testdata/maxmind/test-data/GeoLite2-ASN-Test.mmdb")`
`64`	`66`	`if err != nil {`
`65`	`67`	`t.Fatal(err)`
`66`	`68`	`}`
`@@ -75,7 +77,7 @@ func BenchmarkGeoIP2(b *testing.B) {`
`75`	`77`	`b.ReportAllocs()`
`76`	`78`
`77`	`79`	`b.Run("country", func(b *testing.B) {`
`78`		`- reader, err := NewCountryReaderFromFile("testdata/GeoIP2-Country.mmdb")`
	`80`	`+ reader, err := NewCountryReaderFromFile("testdata/maxmind/test-data/GeoIP2-Country-Test.mmdb")`
`79`	`81`	`if err != nil {`
`80`	`82`	`b.Fatal(err)`
`81`	`83`	`}`
`@@ -94,7 +96,7 @@ func BenchmarkGeoIP2(b *testing.B) {`
`94`	`96`	`})`
`95`	`97`
`96`	`98`	`b.Run("city", func(b *testing.B) {`
`97`		`- reader, err := NewCityReaderFromFile("testdata/GeoIP2-City.mmdb")`
	`99`	`+ reader, err := NewCityReaderFromFile("testdata/maxmind/test-data/GeoIP2-City-Test.mmdb")`
`98`	`100`	`if err != nil {`
`99`	`101`	`b.Fatal(err)`
`100`	`102`	`}`
`@@ -113,7 +115,7 @@ func BenchmarkGeoIP2(b *testing.B) {`
`113`	`115`	`})`
`114`	`116`
`115`	`117`	`b.Run("isp", func(b *testing.B) {`
`116`		`- reader, err := NewISPReaderFromFile("testdata/GeoIP2-ISP.mmdb")`
	`118`	`+ reader, err := NewISPReaderFromFile("testdata/maxmind/test-data/GeoIP2-ISP-Test.mmdb")`
`117`	`119`	`if err != nil {`
`118`	`120`	`b.Fatal(err)`
`119`	`121`	`}`
`@@ -132,7 +134,7 @@ func BenchmarkGeoIP2(b *testing.B) {`
`132`	`134`	`})`
`133`	`135`
`134`	`136`	`b.Run("connection_type", func(b *testing.B) {`
`135`		`- reader, err := NewConnectionTypeReaderFromFile("testdata/GeoIP2-Connection-Type.mmdb")`
	`137`	`+ reader, err := NewConnectionTypeReaderFromFile("testdata/maxmind/test-data/GeoIP2-Connection-Type-Test.mmdb")`
`136`	`138`	`if err != nil {`
`137`	`139`	`b.Fatal(err)`
`138`	`140`	`}`
`@@ -151,7 +153,7 @@ func BenchmarkGeoIP2(b *testing.B) {`
`151`	`153`	`})`
`152`	`154`
`153`	`155`	`b.Run("asn", func(b *testing.B) {`
`154`		`- reader, err := NewASNReaderFromFile("testdata/GeoLite2-ASN.mmdb")`
	`156`	`+ reader, err := NewASNReaderFromFile("testdata/maxmind/test-data/GeoLite2-ASN-Test.mmdb")`
`155`	`157`	`if err != nil {`
`156`	`158`	`b.Fatal(err)`
`157`	`159`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`func TestAnonymousIP(t *testing.T) {`
`12`		`- reader, err := NewAnonymousIPReaderFromFile("testdata/GeoIP2-Anonymous-IP-Test.mmdb")`
	`12`	`+ reader, err := NewAnonymousIPReaderFromFile("testdata/maxmind/test-data/GeoIP2-Anonymous-IP-Test.mmdb")`
`13`	`13`	`if err != nil {`
`14`	`14`	`t.Fatal(err)`
`15`	`15`	`}`
`@@ -63,7 +63,7 @@ func TestReaderZeroLength(t *testing.T) {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`func TestCity(t *testing.T) {`
`66`		`- reader, err := NewCityReaderFromFile("testdata/GeoIP2-City-Test.mmdb")`
	`66`	`+ reader, err := NewCityReaderFromFile("testdata/maxmind/test-data/GeoIP2-City-Test.mmdb")`
`67`	`67`	`if err != nil {`
`68`	`68`	`t.Fatal(err)`
`69`	`69`	`}`
`@@ -133,7 +133,7 @@ func TestCity(t *testing.T) {`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`func TestConnectionType(t *testing.T) {`
`136`		`- reader, err := NewConnectionTypeReaderFromFile("testdata/GeoIP2-Connection-Type-Test.mmdb")`
	`136`	`+ reader, err := NewConnectionTypeReaderFromFile("testdata/maxmind/test-data/GeoIP2-Connection-Type-Test.mmdb")`
`137`	`137`	`if err != nil {`
`138`	`138`	`t.Fatal(err)`
`139`	`139`	`}`
`@@ -142,21 +142,21 @@ func TestConnectionType(t *testing.T) {`
`142`	`142`	`if err != nil {`
`143`	`143`	`t.Fatal(err)`
`144`	`144`	`}`
`145`		`- if record != "Dialup" {`
	`145`	`+ if record != "Cable/DSL" {`
`146`	`146`	`t.Fatal()`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`record, err = reader.Lookup(net.ParseIP("1.0.1.0"))`
`150`	`150`	`if err != nil {`
`151`	`151`	`t.Fatal(err)`
`152`	`152`	`}`
`153`		`- if record != "Cable/DSL" {`
	`153`	`+ if record != "Cellular" {`
`154`	`154`	`t.Fatal()`
`155`	`155`	`}`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`func TestCountry(t *testing.T) {`
`159`		`- reader, err := NewCountryReaderFromFile("testdata/GeoIP2-Country-Test.mmdb")`
	`159`	`+ reader, err := NewCountryReaderFromFile("testdata/maxmind/test-data/GeoIP2-Country-Test.mmdb")`
`160`	`160`	`if err != nil {`
`161`	`161`	`t.Fatal(err)`
`162`	`162`	`}`
`@@ -240,7 +240,7 @@ func TestCountry(t *testing.T) {`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`func TestDomain(t *testing.T) {`
`243`		`- reader, err := NewDomainReaderFromFile("testdata/GeoIP2-Domain-Test.mmdb")`
	`243`	`+ reader, err := NewDomainReaderFromFile("testdata/maxmind/test-data/GeoIP2-Domain-Test.mmdb")`
`244`	`244`	`if err != nil {`
`245`	`245`	`t.Fatal(err)`
`246`	`246`	`}`
`@@ -263,7 +263,7 @@ func TestDomain(t *testing.T) {`
`263`	`263`	`}`
`264`	`264`
`265`	`265`	`func TestEnterprise(t *testing.T) {`
`266`		`- reader, err := NewEnterpriseReaderFromFile("testdata/GeoIP2-Enterprise-Test.mmdb")`
	`266`	`+ reader, err := NewEnterpriseReaderFromFile("testdata/maxmind/test-data/GeoIP2-Enterprise-Test.mmdb")`
`267`	`267`	`if err != nil {`
`268`	`268`	`t.Fatal(err)`
`269`	`269`	`}`
`@@ -340,7 +340,7 @@ func TestEnterprise(t *testing.T) {`
`340`	`340`	`}`
`341`	`341`
`342`	`342`	`func TestISP(t *testing.T) {`
`343`		`- reader, err := NewISPReaderFromFile("testdata/GeoIP2-ISP-Test.mmdb")`
	`343`	`+ reader, err := NewISPReaderFromFile("testdata/maxmind/test-data/GeoIP2-ISP-Test.mmdb")`
`344`	`344`	`if err != nil {`
`345`	`345`	`t.Fatal(err)`
`346`	`346`	`}`
`@@ -381,7 +381,7 @@ func TestISP(t *testing.T) {`
`381`	`381`	`}`
`382`	`382`
`383`	`383`	`func TestASN(t *testing.T) {`
`384`		`- reader, err := NewASNReaderFromFile("testdata/GeoLite2-ASN-Test.mmdb")`
	`384`	`+ reader, err := NewASNReaderFromFile("testdata/maxmind/test-data/GeoLite2-ASN-Test.mmdb")`
`385`	`385`	`if err != nil {`
`386`	`386`	`t.Fatal(err)`
`387`	`387`	`}`
`@@ -410,7 +410,7 @@ func TestASN(t *testing.T) {`
`410`	`410`	`}`
`411`	`411`
`412`	`412`	`func TestDBIPCity(t *testing.T) {`
`413`		`- reader, err := NewCityReaderFromFile("testdata/dbip-city-lite.mmdb")`
	`413`	`+ reader, err := NewCityReaderFromFile("testdata/dbip/dbip-city-lite.mmdb")`
`414`	`414`	`if err != nil {`
`415`	`415`	`t.Fatal(err)`
`416`	`416`	`}`
`@@ -421,13 +421,13 @@ func TestDBIPCity(t *testing.T) {`
`421`	`421`	`if record.City.GeoNameID != 0 {`
`422`	`422`	`t.Fatal()`
`423`	`423`	`}`
`424`		`- if record.City.Names["en"] != "Boston" {`
	`424`	`+ if record.City.Names["en"] != "Medfield" {`
`425`	`425`	`t.Fatal()`
`426`	`426`	`}`
`427`		`- if record.Location.Latitude != 42.3601 {`
	`427`	`+ if record.Location.Latitude != 42.1876 {`
`428`	`428`	`t.Fatal()`
`429`	`429`	`}`
`430`		`- if record.Location.Longitude != -71.0589 {`
	`430`	`+ if record.Location.Longitude != -71.3065 {`
`431`	`431`	`t.Fatal()`
`432`	`432`	`}`
`433`	`433`	`if len(record.Subdivisions) != 1 {`
`@@ -439,7 +439,7 @@ func TestDBIPCity(t *testing.T) {`
`439`	`439`	`}`
`440`	`440`
`441`	`441`	`func TestDBIPCountry(t *testing.T) {`
`442`		`- reader, err := NewCountryReaderFromFile("testdata/dbip-country-lite.mmdb")`
	`442`	`+ reader, err := NewCountryReaderFromFile("testdata/dbip/dbip-country-lite.mmdb")`
`443`	`443`	`if err != nil {`
`444`	`444`	`t.Fatal(err)`
`445`	`445`	`}`
`@@ -473,7 +473,7 @@ func TestDBIPCountry(t *testing.T) {`
`473`	`473`	`}`
`474`	`474`
`475`	`475`	`func TestDBIPASN(t *testing.T) {`
`476`		`- reader, err := NewASNReaderFromFile("testdata/dbip-asn-lite.mmdb")`
	`476`	`+ reader, err := NewASNReaderFromFile("testdata/dbip/dbip-asn-lite.mmdb")`
`477`	`477`	`if err != nil {`
`478`	`478`	`t.Fatal(err)`
`479`	`479`	`}`