Added test and fix for NoLookup interface

getlantern · Jan 7, 2024 · bef5e89 · bef5e89
1 parent 036f861
commit bef5e89
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/GeoIP2-City-Test.mmdb b/GeoIP2-City-Test.mmdb
diff --git a/geo.go b/geo.go
@@ -58,15 +58,18 @@ type CityLookup interface {
 // NoLookup is a Lookup implementation which always return empty result.
 type NoLookup struct{}
 
-func (l NoLookup) CountryCode(ip net.IP) string { return "" }
-func (l NoLookup) ISP(ip net.IP) string         { return "" }
-func (l NoLookup) ASN(ip net.IP) string         { return "" }
+func (l NoLookup) CountryCode(ip net.IP) string    { return "" }
+func (l NoLookup) ISP(ip net.IP) string            { return "" }
+func (l NoLookup) ASN(ip net.IP) string            { return "" }
+func (l NoLookup) City(ip net.IP) (string, string) { return "", "" }
 func (l NoLookup) Ready() <-chan struct{} {
 	ch := make(chan struct{})
 	close(ch)
 	return ch
 }
 
+var _ Lookup = NoLookup{}
+
 type lookup struct {
 	runner    *keepcurrent.Runner
 	db        atomic.Value

diff --git a/geo_test.go b/geo_test.go
@@ -90,3 +90,17 @@ func TestFromFile(t *testing.T) {
 	testLookupISP(t, l, "127.0.0.1", "")
 	testLookupISP(t, l, "1.1.1.1", "")
 }
+
+func TestLookupCity(t *testing.T) {
+	filePath := "./GeoIP2-City-Test.mmdb"
+	l, err := FromFile(filePath)
+	assert.NoError(t, err)
+
+	testLookupCity(t, l, "81.2.69.142", "London", "United Kingdom")
+}
+
+func testLookupCity(t *testing.T, l Lookup, ip string, expectedCity, expectedCountry string) {
+	city, country := l.City(net.ParseIP(ip))
+	assert.Equal(t, expectedCity, city)
+	assert.Equal(t, expectedCountry, country)
+}