summaryrefslogtreecommitdiff
path: root/app/src/androidTest
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/androidTest')
-rw-r--r--app/src/androidTest/java/se/leap/bitmaskclient/test/BaseTestDashboard.java2
-rw-r--r--app/src/androidTest/java/se/leap/bitmaskclient/test/VpnTestController.java14
2 files changed, 6 insertions, 10 deletions
diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/BaseTestDashboard.java b/app/src/androidTest/java/se/leap/bitmaskclient/test/BaseTestDashboard.java
index fae44d1c..9a9131fd 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/BaseTestDashboard.java
+++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/BaseTestDashboard.java
@@ -50,7 +50,7 @@ public abstract class BaseTestDashboard extends ActivityInstrumentationTestCase2
private void clickAndWaitForDashboard(String click_text) {
solo.clickOnText(click_text);
- assertTrue(solo.waitForActivity(Dashboard.class, 5000));
+ assertTrue(solo.waitForActivity(Dashboard.class, 80 * 1000));
}
static boolean isShownWithinConfinesOfVisibleScreen(View view) {
diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/VpnTestController.java b/app/src/androidTest/java/se/leap/bitmaskclient/test/VpnTestController.java
index 40a9f656..25d81da1 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/VpnTestController.java
+++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/VpnTestController.java
@@ -52,20 +52,16 @@ public class VpnTestController {
}
protected FabButton getVpnWholeIcon() {
- try {
- View view = solo.getView(R.id.vpn_Status_Image);
- if (view != null)
- return (FabButton) view;
- else
- return null;
- } catch (AssertionFailedError e) {
+ View view = solo.getView(R.id.vpn_Status_Image);
+ if (view != null)
+ return (FabButton) view;
+ else
return null;
- }
}
protected void turningEipOn() {
assertInProgress();
- int max_seconds_until_connected = 30;
+ int max_seconds_until_connected = 120;
Condition condition = new Condition() {
@Override