diff options
Diffstat (limited to 'app/src/androidTest')
3 files changed, 19 insertions, 8 deletions
diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/BaseTestDashboardFragment.java b/app/src/androidTest/java/se/leap/bitmaskclient/test/BaseTestDashboardFragment.java index 3e572c31..d0b8cf6f 100644 --- a/app/src/androidTest/java/se/leap/bitmaskclient/test/BaseTestDashboardFragment.java +++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/BaseTestDashboardFragment.java @@ -54,7 +54,7 @@ public abstract class BaseTestDashboardFragment extends ActivityInstrumentationT } private void clickAndWaitForDashboard(String click_text) { - solo.clickOnText(click_text); + solo.clickOnButton(click_text); assertTrue(solo.waitForActivity(Dashboard.class, 80 * 1000)); } diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/UserStatusTestController.java b/app/src/androidTest/java/se/leap/bitmaskclient/test/UserStatusTestController.java index 821a23fd..76d14911 100644 --- a/app/src/androidTest/java/se/leap/bitmaskclient/test/UserStatusTestController.java +++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/UserStatusTestController.java @@ -30,7 +30,7 @@ public class UserStatusTestController { void logIn(String username, String password, boolean expectSuccess) { solo.enterText(0, username); solo.enterText(1, password); - solo.clickOnText(solo.getString(R.string.login_button)); + solo.clickOnButton(solo.getString(R.string.login_button)); assertTrue(solo.waitForDialogToClose()); if (expectSuccess) { 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 b0996032..d339ab26 100644 --- a/app/src/androidTest/java/se/leap/bitmaskclient/test/VpnTestController.java +++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/VpnTestController.java @@ -9,6 +9,7 @@ import com.robotium.solo.Solo; import de.blinkt.openvpn.activities.DisconnectVPN; import mbanje.kurt.fabbutton.FabButton; import mbanje.kurt.fabbutton.ProgressRingView; +import se.leap.bitmaskclient.Dashboard; import se.leap.bitmaskclient.R; import static junit.framework.Assert.assertTrue; @@ -48,7 +49,9 @@ public class VpnTestController { } protected FabButton getVpnWholeIcon() { - View view = solo.getView(R.id.vpn_Status_Image); + assertTrue(solo.waitForActivity(Dashboard.class, 5 * 1000)); + + View view = solo.getView(R.id.vpn_status_image); if (view != null) return (FabButton) view; else @@ -92,9 +95,9 @@ public class VpnTestController { okToBrowserWarning(); sayOkToDisconnect(); - int max_seconds_until_connected = 1; + int max_seconds_until_connected = 120; - Condition condition = new Condition() { + Condition condition = new Condition() { @Override public boolean isSatisfied() { return iconShowsDisconnected(); @@ -107,17 +110,25 @@ public class VpnTestController { private void okToBrowserWarning() { assertTrue(solo.waitForDialogToOpen()); clickYes(); + solo.waitForDialogToClose(); } private void clickYes() { String yes = solo.getString(android.R.string.yes); - solo.clickOnText(yes); + solo.clickOnButton(yes); + } + + private void clickDisconnect() { + String disconnect = solo.getString(R.string.cancel_connection); + solo.clickOnButton(disconnect); } private void sayOkToDisconnect() throws IllegalStateException { boolean disconnect_vpn_appeared = solo.waitForActivity(DisconnectVPN.class); - if(disconnect_vpn_appeared) - clickYes(); + if(disconnect_vpn_appeared){ + clickDisconnect(); + solo.waitForDialogToClose(); + } else throw new IllegalStateException(); } |