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/TestEIP.java81
-rw-r--r--app/src/androidTest/legacy/BaseTestDashboardFragment.java (renamed from app/src/androidTest/java/se/leap/bitmaskclient/test/BaseTestDashboardFragment.java)0
-rw-r--r--app/src/androidTest/legacy/ConnectionManager.java (renamed from app/src/androidTest/java/se/leap/bitmaskclient/test/ConnectionManager.java)0
-rw-r--r--app/src/androidTest/legacy/FromAssets.java (renamed from app/src/androidTest/java/se/leap/bitmaskclient/test/FromAssets.java)0
-rw-r--r--app/src/androidTest/legacy/Screenshot.java (renamed from app/src/androidTest/java/se/leap/bitmaskclient/test/Screenshot.java)0
-rw-r--r--app/src/androidTest/legacy/TestCalendarProvider.java (renamed from app/src/androidTest/java/se/leap/bitmaskclient/test/TestCalendarProvider.java)0
-rw-r--r--app/src/androidTest/legacy/TestConstants.java (renamed from app/src/androidTest/java/se/leap/bitmaskclient/test/TestConstants.java)0
-rw-r--r--app/src/androidTest/legacy/TestDashboardIntegration.java (renamed from app/src/androidTest/java/se/leap/bitmaskclient/test/TestDashboardIntegration.java)0
-rw-r--r--app/src/androidTest/legacy/TestEipFragment.java (renamed from app/src/androidTest/java/se/leap/bitmaskclient/test/TestEipFragment.java)0
-rw-r--r--app/src/androidTest/legacy/TestGatewaysManager.java (renamed from app/src/androidTest/java/se/leap/bitmaskclient/test/TestGatewaysManager.java)0
-rw-r--r--app/src/androidTest/legacy/TestLeapSRPSession.java (renamed from app/src/androidTest/java/se/leap/bitmaskclient/test/TestLeapSRPSession.java)0
-rw-r--r--app/src/androidTest/legacy/TestProviderListActivity.java (renamed from app/src/androidTest/java/se/leap/bitmaskclient/test/TestProviderListActivity.java)0
-rw-r--r--app/src/androidTest/legacy/TestUserStatusFragment.java (renamed from app/src/androidTest/java/se/leap/bitmaskclient/test/TestUserStatusFragment.java)0
-rw-r--r--app/src/androidTest/legacy/TestVpnCertificateValidator.java (renamed from app/src/androidTest/java/se/leap/bitmaskclient/test/TestVpnCertificateValidator.java)0
-rw-r--r--app/src/androidTest/legacy/UserStatusTestController.java (renamed from app/src/androidTest/java/se/leap/bitmaskclient/test/UserStatusTestController.java)0
-rw-r--r--app/src/androidTest/legacy/VpnTestController.java (renamed from app/src/androidTest/java/se/leap/bitmaskclient/test/VpnTestController.java)1
16 files changed, 1 insertions, 81 deletions
diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/TestEIP.java b/app/src/androidTest/java/se/leap/bitmaskclient/test/TestEIP.java
deleted file mode 100644
index 4c215360..00000000
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/TestEIP.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * Copyright (c) 2013, 2014, 2015 LEAP Encryption Access Project and contributers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package se.leap.bitmaskclient.test;
-
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.test.ServiceTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-
-import se.leap.bitmaskclient.eip.EIP;
-
-import static se.leap.bitmaskclient.Constants.EIP_ACTION_CHECK_CERT_VALIDITY;
-import static se.leap.bitmaskclient.Constants.PROVIDER_VPN_CERTIFICATE;
-import static se.leap.bitmaskclient.Constants.SHARED_PREFERENCES;
-
-/**
- * @author parmegv
- */
-public class TestEIP extends ServiceTestCase<EIP> {
-
- private Context context;
- private Intent intent;
- private SharedPreferences preferences;
-
- public TestEIP(Class<EIP> activityClass) {
- super(activityClass);
- context = getSystemContext();
- intent = new Intent(context, EIP.class);
- preferences = context.getSharedPreferences(SHARED_PREFERENCES, Context.MODE_PRIVATE);
- }
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- }
-
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
- @MediumTest
- private void testCheckCertValidity() {
- testEmptyCertificate();
- testExpiredCertificate();
- // Wait for the service to start
- // Check result is OK.
- }
-
- private void testEmptyCertificate() {
- preferences.edit().putString(PROVIDER_VPN_CERTIFICATE, "").apply();
- startService(EIP_ACTION_CHECK_CERT_VALIDITY);
- }
-
- private void testExpiredCertificate() {
- String expired_certificate = "expired certificate";
- preferences.edit().putString(PROVIDER_VPN_CERTIFICATE, expired_certificate).apply();
- startService(EIP_ACTION_CHECK_CERT_VALIDITY);
- }
-
- private void startService(String action) {
- intent.setAction(action);
- startService(intent);
- }
-}
diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/BaseTestDashboardFragment.java b/app/src/androidTest/legacy/BaseTestDashboardFragment.java
index e187d424..e187d424 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/BaseTestDashboardFragment.java
+++ b/app/src/androidTest/legacy/BaseTestDashboardFragment.java
diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/ConnectionManager.java b/app/src/androidTest/legacy/ConnectionManager.java
index 6fb7d8a9..6fb7d8a9 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/ConnectionManager.java
+++ b/app/src/androidTest/legacy/ConnectionManager.java
diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/FromAssets.java b/app/src/androidTest/legacy/FromAssets.java
index 6a4c1ee2..6a4c1ee2 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/FromAssets.java
+++ b/app/src/androidTest/legacy/FromAssets.java
diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/Screenshot.java b/app/src/androidTest/legacy/Screenshot.java
index ade28b73..ade28b73 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/Screenshot.java
+++ b/app/src/androidTest/legacy/Screenshot.java
diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/TestCalendarProvider.java b/app/src/androidTest/legacy/TestCalendarProvider.java
index 82ea8b59..82ea8b59 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/TestCalendarProvider.java
+++ b/app/src/androidTest/legacy/TestCalendarProvider.java
diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/TestConstants.java b/app/src/androidTest/legacy/TestConstants.java
index 6b4cdfb1..6b4cdfb1 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/TestConstants.java
+++ b/app/src/androidTest/legacy/TestConstants.java
diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/TestDashboardIntegration.java b/app/src/androidTest/legacy/TestDashboardIntegration.java
index ad2b4a00..ad2b4a00 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/TestDashboardIntegration.java
+++ b/app/src/androidTest/legacy/TestDashboardIntegration.java
diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/TestEipFragment.java b/app/src/androidTest/legacy/TestEipFragment.java
index 4227f19a..4227f19a 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/TestEipFragment.java
+++ b/app/src/androidTest/legacy/TestEipFragment.java
diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/TestGatewaysManager.java b/app/src/androidTest/legacy/TestGatewaysManager.java
index 02c521be..02c521be 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/TestGatewaysManager.java
+++ b/app/src/androidTest/legacy/TestGatewaysManager.java
diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/TestLeapSRPSession.java b/app/src/androidTest/legacy/TestLeapSRPSession.java
index 8d0df59b..8d0df59b 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/TestLeapSRPSession.java
+++ b/app/src/androidTest/legacy/TestLeapSRPSession.java
diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/TestProviderListActivity.java b/app/src/androidTest/legacy/TestProviderListActivity.java
index 4ab705e7..4ab705e7 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/TestProviderListActivity.java
+++ b/app/src/androidTest/legacy/TestProviderListActivity.java
diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/TestUserStatusFragment.java b/app/src/androidTest/legacy/TestUserStatusFragment.java
index d77b9796..d77b9796 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/TestUserStatusFragment.java
+++ b/app/src/androidTest/legacy/TestUserStatusFragment.java
diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/TestVpnCertificateValidator.java b/app/src/androidTest/legacy/TestVpnCertificateValidator.java
index 70596c10..70596c10 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/TestVpnCertificateValidator.java
+++ b/app/src/androidTest/legacy/TestVpnCertificateValidator.java
diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/UserStatusTestController.java b/app/src/androidTest/legacy/UserStatusTestController.java
index 3b0daf9a..3b0daf9a 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/UserStatusTestController.java
+++ b/app/src/androidTest/legacy/UserStatusTestController.java
diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/VpnTestController.java b/app/src/androidTest/legacy/VpnTestController.java
index f6760161..4c6a6370 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/VpnTestController.java
+++ b/app/src/androidTest/legacy/VpnTestController.java
@@ -6,6 +6,7 @@ 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;