summaryrefslogtreecommitdiff
path: root/app/src/androidTest/java/se
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2015-06-01 10:18:33 +0200
committerParménides GV <parmegv@sdf.org>2015-06-01 10:18:33 +0200
commitfcc8c55139143092005ffa5b56df2f4320fd9ec4 (patch)
tree987aa93ba9561a6c374da5d768c945917d52674d /app/src/androidTest/java/se
parent37d3488bb2103245eb8ac6a3fe3abbc6dd1c12b5 (diff)
Update robotium + increase wait times
Sometimes, the emulator is so slow (I wish genymotion was open source...) that even though everything's going OK tests fail because they don't wait enough.
Diffstat (limited to 'app/src/androidTest/java/se')
-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