summaryrefslogtreecommitdiff
path: root/app/src/androidTest/legacy/TestGatewaysManager.java
diff options
context:
space:
mode:
authorcyberta <cyberta@riseup.net>2019-09-19 07:34:54 -0700
committercyberta <cyberta@riseup.net>2019-09-19 07:34:54 -0700
commit7820e8c0819a10c5b4729678607681fcfe30cbae (patch)
tree43590440908ce85ef286487bb5c44155b3de1f8e /app/src/androidTest/legacy/TestGatewaysManager.java
parent303dd2a0e498fac87144b2d7ac930b27fe1bc7e8 (diff)
parent2e1c94d3f51dc6d667435b2a2bbd81a036d57bae (diff)
Merge branch 'master' into 'master'
[New Feature] Option for excluding apps from VPN See merge request leap/bitmask_android!93
Diffstat (limited to 'app/src/androidTest/legacy/TestGatewaysManager.java')
-rw-r--r--app/src/androidTest/legacy/TestGatewaysManager.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/src/androidTest/legacy/TestGatewaysManager.java b/app/src/androidTest/legacy/TestGatewaysManager.java
index 02c521be..80438073 100644
--- a/app/src/androidTest/legacy/TestGatewaysManager.java
+++ b/app/src/androidTest/legacy/TestGatewaysManager.java
@@ -119,7 +119,7 @@ public class TestGatewaysManager extends InstrumentationTestCase {
eip_definition = new JSONObject(assets.toString(TestConstants.EIP_DEFINITION_FILE));
JSONObject secrets = new JSONObject(assets.toString(TestConstants.SECRETS_FILE));
JSONObject gateway = new JSONObject(assets.toString(TestConstants.GATEWAY_FILE));
- this.gateway = new Gateway(eip_definition, secrets, gateway);
+ this.gateway = new Gateway(eip_definition, secrets, gateway, context);
} catch (Exception e) {
e.printStackTrace();
}
@@ -137,7 +137,7 @@ public class TestGatewaysManager extends InstrumentationTestCase {
capabilitiesJson.put("protocols", protocolJsonArray);
gatewayJson.put("protocols", protocolJsonArray);
}
- this.gateway = new Gateway(eip_definition, secrets, gateways.getJSONObject(0));
+ this.gateway = new Gateway(eip_definition, secrets, gateways.getJSONObject(0), context);
} catch (JSONException e) {
e.printStackTrace();
assertFalse(true);
@@ -153,7 +153,7 @@ public class TestGatewaysManager extends InstrumentationTestCase {
eip_definition = new JSONObject(assets.toString(TestConstants.EIP_DEFINITION_FILE));
JSONObject secrets = new JSONObject(assets.toString(TestConstants.SECRETS_FILE).replace("6u6", "7u7"));
JSONObject gateway = new JSONObject(assets.toString(TestConstants.GATEWAY_FILE));
- this.gateway = new Gateway(eip_definition, secrets, gateway);
+ this.gateway = new Gateway(eip_definition, secrets, gateway, context);
} catch (Exception e) {
e.printStackTrace();
}