summaryrefslogtreecommitdiff
path: root/app/src/androidTest
diff options
context:
space:
mode:
authorcyberta <cyberta@riseup.net>2017-12-14 10:19:03 -0800
committercyberta <cyberta@riseup.net>2017-12-14 10:19:03 -0800
commit67ff3447f10c43770dc9ee4dccf358321063d131 (patch)
treecb29df26bec196f8628947897a5fe9977b00a229 /app/src/androidTest
parent18e24819eed388d349dbf6d7cd21534d7074bf5d (diff)
parent25d215400d500bdb7537e604ed91ced586821ef2 (diff)
Merge branch '8742_always-on_VPN' into '0.9.8'
8742 always on vpn See merge request leap/bitmask_android!20
Diffstat (limited to 'app/src/androidTest')
-rw-r--r--app/src/androidTest/java/se/leap/bitmaskclient/test/TestDashboardIntegration.java2
-rw-r--r--app/src/androidTest/java/se/leap/bitmaskclient/test/UserStatusTestController.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/TestDashboardIntegration.java b/app/src/androidTest/java/se/leap/bitmaskclient/test/TestDashboardIntegration.java
index faeb1791..ad2b4a00 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/TestDashboardIntegration.java
+++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/TestDashboardIntegration.java
@@ -2,7 +2,7 @@ package se.leap.bitmaskclient.test;
import java.io.*;
-import se.leap.bitmaskclient.*;
+import se.leap.bitmaskclient.R;
public class TestDashboardIntegration extends BaseTestDashboardFragment {
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 f5cb2260..3b0daf9a 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/UserStatusTestController.java
+++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/UserStatusTestController.java
@@ -4,7 +4,7 @@ import android.view.*;
import com.robotium.solo.*;
-import se.leap.bitmaskclient.*;
+import se.leap.bitmaskclient.R;
import static junit.framework.Assert.assertTrue;