summaryrefslogtreecommitdiff
path: root/app/src/androidTest
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-04-28 12:00:44 +0200
committerParménides GV <parmegv@sdf.org>2014-04-28 12:00:44 +0200
commitdec816eecc8375d9f031a4b59753302e8ab9b16c (patch)
tree47751f7773abe880beaeea939b0b5825f351124e /app/src/androidTest
parent5fc5d37330d3535a0f421632694d1e7918fc22d7 (diff)
parentd4caf8f35fc9dd43d370439e8f6b6727909b15b9 (diff)
Merge branch 'develop'0.5.1
Diffstat (limited to 'app/src/androidTest')
-rw-r--r--app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java2
-rw-r--r--app/src/androidTest/java/se/leap/bitmaskclient/test/testDashboard.java4
2 files changed, 3 insertions, 3 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 847d8cdd..8ddfbc57 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java
+++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java
@@ -46,7 +46,7 @@ public class testConfigurationWizard extends ActivityInstrumentationTestCase2<Co
public void testAddNewProvider() {
solo.clickOnActionBarItem(R.id.new_provider);
- solo.enterText(0, "dev.bitmask.net");
+ solo.enterText(0, "calyx.net");
solo.clickOnCheckBox(0);
solo.clickOnText(solo.getString(R.string.save));
added_providers = added_providers+1;
diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/testDashboard.java b/app/src/androidTest/java/se/leap/bitmaskclient/test/testDashboard.java
index 269f1d18..bbc3e97d 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/testDashboard.java
+++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/testDashboard.java
@@ -50,14 +50,14 @@ public class testDashboard extends ActivityInstrumentationTestCase2<Dashboard> {
if(!solo.waitForText(getActivity().getString(R.string.eip_state_not_connected)))
fail();
- ConnectionManager.setMobileDataEnabled(false, solo.getCurrentActivity().getApplicationContext());
+ /*ConnectionManager.setMobileDataEnabled(false, solo.getCurrentActivity().getApplicationContext());
solo.clickOnView(solo.getView(R.id.eipSwitch));
if(!solo.waitForText(getActivity().getString(R.string.eip_status_start_pending)))
fail();
if(!solo.waitForText(getActivity().getString(R.string.state_nonetwork)))
fail();
-
+ */
}
public void testLogInAndOut() {