1 files changed, 15 insertions, 2 deletions
diff --git a/app/src/test/java/se/leap/bitmaskclient/testutils/MockHelper.java b/app/src/test/java/se/leap/bitmaskclient/testutils/MockHelper.java
index 481c87cb..c0fc6531 100644
--- a/app/src/test/java/se/leap/bitmaskclient/testutils/MockHelper.java
+++ b/app/src/test/java/se/leap/bitmaskclient/testutils/MockHelper.java
@@ -21,6 +21,7 @@ import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.UnknownHostException;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.X509Certificate;
@@ -398,6 +399,9 @@ public class MockHelper {
                         return providerFromPrefs.getDefinition().toString();
                     case Provider.CA_CERT_FINGERPRINT:
                         return providerFromPrefs.getCaCertFingerprint();
+                    case Provider.CA_CERT:
+                        return providerFromPrefs.getCaCert();
+
                 }
                 return null;
             }
@@ -434,14 +438,23 @@ public class MockHelper {
         BackendMockProvider.provideBackendResponsesFor(errorCase);
     }
 
-    public static OkHttpClientGenerator mockClientGenerator() {
+    public static OkHttpClientGenerator mockClientGenerator(boolean resolveDNS) throws UnknownHostException {
         OkHttpClientGenerator mockClientGenerator = mock(OkHttpClientGenerator.class);
-        OkHttpClient mockedOkHttpClient = mock(OkHttpClient.class);
+        OkHttpClient mockedOkHttpClient = mock(OkHttpClient.class, RETURNS_DEEP_STUBS);
         when(mockClientGenerator.initCommercialCAHttpClient(any(JSONObject.class))).thenReturn(mockedOkHttpClient);
         when(mockClientGenerator.initSelfSignedCAHttpClient(anyString(), any(JSONObject.class))).thenReturn(mockedOkHttpClient);
+        if (resolveDNS) {
+            when(mockedOkHttpClient.dns().lookup(anyString())).thenReturn(new ArrayList<>());
+        } else {
+            when(mockedOkHttpClient.dns().lookup(anyString())).thenThrow(new UnknownHostException());
+        }
         return mockClientGenerator;
     }
 
+    public static OkHttpClientGenerator mockClientGenerator() throws UnknownHostException {
+        return mockClientGenerator(true);
+    }
+
     public static Resources mockResources(InputStream inputStream) throws IOException, JSONException {
         Resources mockedResources = mock(Resources.class, RETURNS_DEEP_STUBS);
         JSONObject errorMessages = new JSONObject(TestSetupHelper.getInputAsString(inputStream));