diff options
author | Parménides GV <parmegv@sdf.org> | 2015-03-30 18:45:12 +0200 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2015-03-30 18:45:12 +0200 |
commit | 45eecc4c3c3380b1f5ec416513ea36144463292d (patch) | |
tree | adb038d4ace3a676b4ca173878654739018e174f /app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java | |
parent | 8cd10bcac50a7e76085d5d7384dc8910a80e44c6 (diff) | |
parent | 66673b5b60eb99d5682a440f6d90a08ccb1835b6 (diff) |
Merge branch 'feature/Unit-tests-to-establish-VPN-with-every-provider-#6781' into develop
Diffstat (limited to 'app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java')
-rw-r--r-- | app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java b/app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java index 7a19409b..1fa4cf2f 100644 --- a/app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java +++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java @@ -32,7 +32,7 @@ public class testConfigurationWizard extends ActivityInstrumentationTestCase2<Co @Override protected void tearDown() throws Exception { - solo.finishOpenedActivities(); + } public void testListProviders() { @@ -97,14 +97,18 @@ public class testConfigurationWizard extends ActivityInstrumentationTestCase2<Co assertTrue("Provider details dialog did not appear", solo.waitForActivity(AboutActivity.class)); } - protected void toDashboard(String provider) { + protected void toDashboardAnonymously(String provider) { selectProvider(provider); useAnonymously(); } private void useAnonymously() { String text = solo.getString(R.string.use_anonymously_button); - solo.clickOnText(text); - solo.waitForText(solo.getString(R.string.title_activity_dashboard)); + clickAndWaitForDashboard(text); + } + + private void clickAndWaitForDashboard(String click_text) { + solo.clickOnText(click_text); + assertTrue(solo.waitForActivity(Dashboard.class, 5000)); } } |