summaryrefslogtreecommitdiff
path: root/app/src/test/java/se
diff options
context:
space:
mode:
authorcyberta <cyberta@riseup.net>2021-02-26 08:53:28 +0000
committercyberta <cyberta@riseup.net>2021-02-26 08:53:28 +0000
commit8bb73089566e78a195f21f4746c9db416abf95a4 (patch)
treebba73954ec2754f85060622f60d69a19f00980c3 /app/src/test/java/se
parentc62389eaae3768e236875ee5fd20bde29e381c94 (diff)
parentcb1510c9f3ea27d5cffc0c0e370f8270d454e39b (diff)
Merge branch 'fix_custom_preshipping' into 'master'
ensure the private api and the preshipped certificate will be used to setup... Closes #9029 See merge request leap/bitmask_android!130
Diffstat (limited to 'app/src/test/java/se')
-rw-r--r--app/src/test/java/se/leap/bitmaskclient/testutils/MockHelper.java2
1 files changed, 2 insertions, 0 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 d4b7c5d1..5a341cd1 100644
--- a/app/src/test/java/se/leap/bitmaskclient/testutils/MockHelper.java
+++ b/app/src/test/java/se/leap/bitmaskclient/testutils/MockHelper.java
@@ -366,6 +366,8 @@ public class MockHelper {
return getClass().getClassLoader().getResourceAsStream(filename);
}
});
+ when(InputStreamHelper.extractKeyFromInputStream(any(InputStream.class), anyString())).thenCallRealMethod();
+ when(InputStreamHelper.inputStreamToJson(any(InputStream.class))).thenCallRealMethod();
}