1 files changed, 14 insertions, 12 deletions
diff --git a/tests/src/cgeo/geocaching/cgeoApplicationTest.java b/tests/src/cgeo/geocaching/cgeoApplicationTest.java
index b808616..83bf28d 100644
--- a/tests/src/cgeo/geocaching/cgeoApplicationTest.java
+++ b/tests/src/cgeo/geocaching/cgeoApplicationTest.java
@@ -13,6 +13,8 @@ import cgeo.geocaching.enumerations.StatusCode;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.geopoint.Viewport;
 import cgeo.geocaching.loaders.RecaptchaReceiver;
+import cgeo.geocaching.settings.Settings;
+import cgeo.geocaching.settings.TestSettings;
 import cgeo.geocaching.test.RegExPerformanceTest;
 import cgeo.geocaching.test.mock.GC1ZXX2;
 import cgeo.geocaching.test.mock.GC2CJPF;
@@ -130,7 +132,7 @@ public class cgeoApplicationTest extends CGeoTestCase {
      */
     @MediumTest
     public static void testSearchByGeocodeNotLoggedIn() {
-        final ImmutablePair<String, String> login = Settings.getLogin();
+        final ImmutablePair<String, String> login = Settings.getGcLogin();
         final String memberStatus = Settings.getMemberStatus();
 
         try {
@@ -158,7 +160,7 @@ public class cgeoApplicationTest extends CGeoTestCase {
 
         } finally {
             // restore user and password
-            Settings.setLogin(login.left, login.right);
+            TestSettings.setLogin(login.left, login.right);
             Settings.setMemberStatus(memberStatus);
             Login.login();
         }
@@ -169,7 +171,7 @@ public class cgeoApplicationTest extends CGeoTestCase {
      */
     @MediumTest
     public static void testSearchErrorOccured() {
-        final ImmutablePair<String, String> login = Settings.getLogin();
+        final ImmutablePair<String, String> login = Settings.getGcLogin();
         final String memberStatus = Settings.getMemberStatus();
 
         try {
@@ -184,7 +186,7 @@ public class cgeoApplicationTest extends CGeoTestCase {
 
         } finally {
             // restore user and password
-            Settings.setLogin(login.left, login.right);
+            TestSettings.setLogin(login.left, login.right);
             Settings.setMemberStatus(memberStatus);
             Login.login();
         }
@@ -201,15 +203,15 @@ public class cgeoApplicationTest extends CGeoTestCase {
         final boolean excludeDisabled = Settings.isExcludeDisabledCaches();
         try {
             // set up settings required for test
-            Settings.setExcludeMine(false);
-            Settings.setExcludeDisabledCaches(false);
+            TestSettings.setExcludeMine(false);
+            TestSettings.setExcludeDisabledCaches(false);
 
             runnable.run();
 
         } finally {
             // restore user settings
-            Settings.setExcludeMine(excludeMine);
-            Settings.setExcludeDisabledCaches(excludeDisabled);
+            TestSettings.setExcludeMine(excludeMine);
+            TestSettings.setExcludeDisabledCaches(excludeDisabled);
         }
     }
 
@@ -279,7 +281,7 @@ public class cgeoApplicationTest extends CGeoTestCase {
 
                 try {
                     // set up settings required for test
-                    Settings.setExcludeMine(false);
+                    TestSettings.setExcludeMine(false);
                     Settings.setCacheType(CacheType.ALL);
 
                     final GC2CJPF mockedCache = new GC2CJPF();
@@ -325,7 +327,7 @@ public class cgeoApplicationTest extends CGeoTestCase {
     @MediumTest
     public static void testSearchByViewportNotLoggedIn() {
 
-        final ImmutablePair<String, String> login = Settings.getLogin();
+        final ImmutablePair<String, String> login = Settings.getGcLogin();
         final String memberStatus = Settings.getMemberStatus();
         final Strategy strategy = Settings.getLiveMapStrategy();
         final Strategy testStrategy = Strategy.FAST; // FASTEST, FAST or DETAILED for tests
@@ -368,7 +370,7 @@ public class cgeoApplicationTest extends CGeoTestCase {
 
         } finally {
             // restore user and password
-            Settings.setLogin(login.left, login.right);
+            TestSettings.setLogin(login.left, login.right);
             Settings.setMemberStatus(memberStatus);
             Login.login();
             Settings.setLiveMapStrategy(strategy);
@@ -411,7 +413,7 @@ public class cgeoApplicationTest extends CGeoTestCase {
 
         Login.logout();
         // Modify login data to avoid an automatic login again
-        Settings.setLogin("c:geo", "c:geo");
+        TestSettings.setLogin("c:geo", "c:geo");
         Settings.setMemberStatus("Basic member");
     }