diff options
author | Parménides GV <parmegv@sdf.org> | 2015-04-10 11:19:03 +0200 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2015-04-10 11:19:03 +0200 |
commit | 1f41fec6765e49838141ad29151713c7ac3dd17c (patch) | |
tree | d4c63d5bbb8e51d91d75179ad01abd9a7565badc /app/src/androidTest/java/se/leap/bitmaskclient/test/testGatewaysManager.java | |
parent | c198dbd9dd583d980ae7e70118f67d09bed8de55 (diff) | |
parent | fe95b7693f0f1f90d23ba2596ad3b11195efb11d (diff) |
Merge branch 'develop'0.9.3
Diffstat (limited to 'app/src/androidTest/java/se/leap/bitmaskclient/test/testGatewaysManager.java')
-rw-r--r-- | app/src/androidTest/java/se/leap/bitmaskclient/test/testGatewaysManager.java | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/testGatewaysManager.java b/app/src/androidTest/java/se/leap/bitmaskclient/test/testGatewaysManager.java index c4303251..086c060f 100644 --- a/app/src/androidTest/java/se/leap/bitmaskclient/test/testGatewaysManager.java +++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/testGatewaysManager.java @@ -16,20 +16,15 @@ */ package se.leap.bitmaskclient.test; -import android.app.Activity; -import android.content.Context; -import android.content.SharedPreferences; -import android.test.InstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.SmallTest; +import android.app.*; +import android.content.*; +import android.test.*; +import android.test.suitebuilder.annotation.*; -import junit.framework.Test; +import org.json.*; -import org.json.JSONObject; - -import se.leap.bitmaskclient.Dashboard; -import se.leap.bitmaskclient.eip.Gateway; -import se.leap.bitmaskclient.eip.GatewaysManager; +import se.leap.bitmaskclient.*; +import se.leap.bitmaskclient.eip.*; /** * @author parmegv @@ -83,7 +78,7 @@ public class testGatewaysManager extends InstrumentationTestCase { assertEquals("[]", gateways_manager.toString()); gateways_manager.addFromString(gateway.toString()); - assertEquals("["+gateway.toString()+"]", gateways_manager.toString()); + assertEquals("[" + gateway.toString() + "]", gateways_manager.toString()); } @SmallTest @@ -94,7 +89,7 @@ public class testGatewaysManager extends InstrumentationTestCase { gateways_manager.addFromString(gateway.toString()); assertFalse(gateways_manager.isEmpty()); } - + private void mockGatewaysManager() { context = getInstrumentation().getContext(); preferences = context.getSharedPreferences(Dashboard.SHARED_PREFERENCES, Activity.MODE_PRIVATE); |