Merge branch 'support_geoip' into 'master'

Support geoip

See merge request leap/bitmask_android!108

1 files changed, 15 insertions, 3 deletions

diff --git a/app/src/test/java/se/leap/bitmaskclient/ProviderTest.java b/app/src/test/java/se/leap/bitmaskclient/ProviderTest.java
index 0f9d358e..8a74e5de 100644
--- a/app/src/test/java/se/leap/bitmaskclient/ProviderTest.java
+++ b/app/src/test/java/se/leap/bitmaskclient/ProviderTest.java
@@ -23,13 +23,21 @@ public class ProviderTest {
     }
 
     @Test
-    public void testEquals_sameFields_returnsFalse() throws Exception {
+    public void testEquals_differntMainUrl_returnsFalse() throws Exception {
         Provider p1 = TestSetupHelper.getConfiguredProvider();
         Provider p2 = TestSetupHelper.getConfiguredProvider();
         p2.setMainUrl("http://somethingsdiffer.org");
         assertFalse("Providers should be same:", p1.equals(p2));
     }
 
+    @Test
+    public void testEquals_differentGeoIpUrl_returnsFalse() throws Exception {
+        Provider p1 = TestSetupHelper.getConfiguredProvider();
+        Provider p2 = TestSetupHelper.getConfiguredProvider();
+        p2.setGeoipUrl(null);
+        assertFalse("Providers should be same:", p1.equals(p2));
+    }
+
     // see ProviderManagerTest testing add(...)
     @Test
     public void testEqualsThroughSetContains_differentFields_returnsFalse() throws Exception {
@@ -55,7 +63,9 @@ public class ProviderTest {
                 null,
                 null,
                 null,
-                "ptdemo.bitmask.eip-service.json");
+                null,
+                "ptdemo.bitmask.eip-service.json",
+                null);
         assertTrue(p1.supportsPluggableTransports());
     }
 
@@ -67,7 +77,9 @@ public class ProviderTest {
                 null,
                 null,
                 null,
-                "eip-service-two-gateways.json");
+                null,
+                "eip-service-two-gateways.json",
+                null);
         assertFalse(p1.supportsPluggableTransports());
     }