Skip to content

Update tests to handle current version of .mmdb files and use of submodule #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 28, 2025
Merged

Update tests to handle current version of .mmdb files and use of submodule #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "testdata/maxmind"]
path = testdata/maxmind
url = https://github.com/maxmind/MaxMind-DB
17 changes: 17 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).
28 changes: 15 additions & 13 deletions geoip2_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand Down
32 changes: 16 additions & 16 deletions reader_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down Expand Up @@ -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)
}
Expand Down Expand Up @@ -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)
}
Expand All @@ -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)
}
Expand Down Expand Up @@ -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)
}
Expand All @@ -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)
}
Expand Down Expand Up @@ -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)
}
Expand Down Expand Up @@ -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)
}
Expand Down Expand Up @@ -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)
}
Expand All @@ -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 {
Expand All @@ -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)
}
Expand Down Expand Up @@ -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)
}
Expand Down
1 change: 1 addition & 0 deletions testdata/maxmind
Open in desktop
Submodule maxmind added at fb053b