From c4aa8b7a5fc52627997a18f9d04669c8f9734dc2 Mon Sep 17 00:00:00 2001 From: cyberta Date: Thu, 23 Jan 2020 21:18:17 -0600 Subject: fix tests with regard to provider initialization --- .../java/se.leap.bitmaskclient/testutils/TestSetupHelper.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'app/src/sharedTest/java') 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 c6f4db38..c7c85f8d 100644 --- a/app/src/sharedTest/java/se.leap.bitmaskclient/testutils/TestSetupHelper.java +++ b/app/src/sharedTest/java/se.leap.bitmaskclient/testutils/TestSetupHelper.java @@ -51,15 +51,18 @@ public class TestSetupHelper { public static Provider getConfiguredProvider() throws IOException, JSONException { - return getProvider(null, null, null, null, null); + return getProvider(null, null, null, null, null, null); } - public static Provider getProvider(String domain, String providerIp, String caCertFile, String providerJson, String eipServiceJson) { + public static Provider getProvider(String domain, String providerIp, String providerApiIp, String caCertFile, String providerJson, String eipServiceJson) { if (domain == null) domain = "https://riseup.net"; if (providerIp == null) { providerIp = ""; } + if (providerApiIp == null) { + providerApiIp = ""; + } if (caCertFile == null) caCertFile = "riseup.net.pem"; if (providerJson == null) @@ -72,6 +75,7 @@ public class TestSetupHelper { Provider p = new Provider( domain, providerIp, + providerApiIp, getInputAsString(TestSetupHelper.class.getClassLoader().getResourceAsStream(caCertFile)), getInputAsString(TestSetupHelper.class.getClassLoader().getResourceAsStream(providerJson)) -- cgit v1.2.3