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/BaseTestDashboardFragment.java2
-rw-r--r--app/src/androidTest/java/se/leap/bitmaskclient/test/TestConfigurationWizard.java13
-rw-r--r--app/src/androidTest/java/se/leap/bitmaskclient/test/VpnTestController.java1
3 files changed, 2 insertions, 14 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 d0b8cf6f..956049dc 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/BaseTestDashboardFragment.java
+++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/BaseTestDashboardFragment.java
@@ -84,7 +84,7 @@ public abstract class BaseTestDashboardFragment extends ActivityInstrumentationT
}
private void waitForProviderDetails() {
- String text = solo.getString(R.string.provider_details_fragment_title);
+ String text = solo.getString(R.string.provider_details_title);
assertTrue("Provider details dialog did not appear", solo.waitForText(text, 1, 60*1000));
Screenshot.take("Provider details");
}
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 12e88af8..c0d3aab1 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/TestConfigurationWizard.java
+++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/TestConfigurationWizard.java
@@ -7,7 +7,6 @@ import com.robotium.solo.Solo;
import java.io.IOException;
-import se.leap.bitmaskclient.AboutActivity;
import se.leap.bitmaskclient.ConfigurationWizard;
import se.leap.bitmaskclient.R;
@@ -71,7 +70,7 @@ public class TestConfigurationWizard extends ActivityInstrumentationTestCase2<Co
}
private void waitForProviderDetails() {
- String text = solo.getString(R.string.provider_details_fragment_title);
+ String text = solo.getString(R.string.provider_details_title);
assertTrue("Provider details dialog did not appear", solo.waitForText(text, 1, 60*1000));
Screenshot.take("Provider details");
}
@@ -112,14 +111,4 @@ public class TestConfigurationWizard extends ActivityInstrumentationTestCase2<Co
assertTrue("Provider details dialog did not appear", solo.waitForText(text, 1, 60*1000));
}
- public void testShowAbout() {
- showAbout();
- }
-
- private void showAbout() {
- String text = solo.getString(R.string.about);
- solo.clickOnMenuItem(text);
- assertTrue("Provider details dialog did not appear", solo.waitForActivity(AboutActivity.class));
- }
-
}
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 4c6a6370..f6760161 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/VpnTestController.java
+++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/VpnTestController.java
@@ -6,7 +6,6 @@ import android.widget.Button;
import com.robotium.solo.Condition;
import com.robotium.solo.Solo;
-import de.blinkt.openvpn.activities.DisconnectVPN;
import mbanje.kurt.fabbutton.ProgressRingView;
import se.leap.bitmaskclient.Dashboard;
import se.leap.bitmaskclient.R;