diff options
author | Parménides GV <parmegv@sdf.org> | 2015-03-24 19:37:41 +0100 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2015-03-24 19:37:41 +0100 |
commit | 6954d5a4d7739b472ba74bacac76d30aa9e065c9 (patch) | |
tree | 86fddd58a06fb4d57a2f8cd34b017ed86969bdc0 /app/src/androidTest/java/se/leap/bitmaskclient/test/testGatewaysManager.java | |
parent | fb4f332e4a0c669fa559aee0dba159b82c9d28c7 (diff) | |
parent | 9e5d0f1a2399787b1a57349e0e3b5ad596fcbf8f (diff) |
Merge branch 'bug/Clean-logs-and-indentation-#6810' into develop
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); |