From 4e861a972a28bd7eb268fb03c80b989a8b36c2a0 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Thu, 23 Jul 2020 17:41:26 +0200
Subject: adapt existing tests for geoipservice api

---
 .../java/se.leap.bitmaskclient/testutils/TestSetupHelper.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'app/src/sharedTest')

diff --git a/app/src/sharedTest/java/se.leap.bitmaskclient/testutils/TestSetupHelper.java b/app/src/sharedTest/java/se.leap.bitmaskclient/testutils/TestSetupHelper.java
index 69fffcb4..c741faf2 100644
--- a/app/src/sharedTest/java/se.leap.bitmaskclient/testutils/TestSetupHelper.java
+++ b/app/src/sharedTest/java/se.leap.bitmaskclient/testutils/TestSetupHelper.java
@@ -51,10 +51,10 @@ public class TestSetupHelper {
 
 
     public static Provider getConfiguredProvider() throws IOException, JSONException {
-        return getProvider(null,  null, null, null, null, null, null);
+        return getProvider(null,  null, null, null, null, null, null, null);
     }
 
-    public static Provider getProvider(String domain, String geoipUrl, String providerIp, String providerApiIp, String caCertFile, String providerJson, String eipServiceJson) {
+    public static Provider getProvider(String domain, String geoipUrl, String providerIp, String providerApiIp, String caCertFile, String providerJson, String eipServiceJson, String geoIpJson) {
         if (domain == null)
             domain = "https://riseup.net";
         if (geoipUrl == null)
@@ -72,6 +72,9 @@ public class TestSetupHelper {
         if (eipServiceJson == null) {
             eipServiceJson = "riseup.service.json";
         }
+        if (geoIpJson == null) {
+            geoIpJson = "riseup.geoip.json";
+        }
 
         try {
             Provider p = new Provider(
@@ -86,6 +89,10 @@ public class TestSetupHelper {
             JSONObject eipServiceJsonObject = new JSONObject(
                     getInputAsString(TestSetupHelper.class.getClassLoader().getResourceAsStream(eipServiceJson)));
             p.setEipServiceJson(eipServiceJsonObject);
+
+            JSONObject geoIpJsonObject = new JSONObject(
+                    getInputAsString(TestSetupHelper.class.getClassLoader().getResourceAsStream(geoIpJson)));
+            p.setGeoIpJson(geoIpJsonObject);
             return p;
         } catch (IOException | JSONException e) {
             e.printStackTrace();
-- 
cgit v1.2.3