fix tests: `getMapTokens()` is no longer static

2 files changed, 4 insertions, 5 deletions

diff --git a/tests/src/cgeo/geocaching/CgeoApplicationTest.java b/tests/src/cgeo/geocaching/CgeoApplicationTest.java
index f772be6..4583281 100644
--- a/tests/src/cgeo/geocaching/CgeoApplicationTest.java
+++ b/tests/src/cgeo/geocaching/CgeoApplicationTest.java
@@ -26,6 +26,7 @@ import cgeo.geocaching.utils.CancellableHandler;
 import cgeo.geocaching.utils.Log;
 import cgeo.test.Compare;
 
+import junit.framework.Assert;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 
@@ -34,8 +35,6 @@ import android.test.suitebuilder.annotation.SmallTest;
 
 import java.util.GregorianCalendar;
 
-import junit.framework.Assert;
-
 /**
  * The c:geo application test. It can be used for tests that require an
  * application and/or context.
@@ -299,7 +298,7 @@ public class CgeoApplicationTest extends CGeoTestCase {
                     final GC2CJPF mockedCache = new GC2CJPF();
                     deleteCacheFromDB(mockedCache.getGeocode());
 
-                    final MapTokens tokens = GCLogin.getMapTokens();
+                    final MapTokens tokens = GCLogin.getInstance().getMapTokens();
                     final Viewport viewport = new Viewport(mockedCache, 0.003, 0.003);
 
                     // check coords for DETAILED
@@ -340,7 +339,7 @@ public class CgeoApplicationTest extends CGeoTestCase {
     public static void testSearchByViewportNotLoggedIn() {
         withMockedLoginDo(new Runnable() {
 
-            public void run() {
+            public void Crun() {
                 final Strategy strategy = Settings.getLiveMapStrategy();
                 final Strategy testStrategy = Strategy.FAST; // FASTEST, FAST or DETAILED for tests
                 Settings.setLiveMapStrategy(testStrategy);
diff --git a/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java b/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java
index 0caa7d4..a5b9a44 100644
--- a/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java
+++ b/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java
@@ -22,7 +22,7 @@ public class GCConnectorTest extends AbstractResourceInstrumentationTestCase {
             Settings.setCacheType(CacheType.ALL);
             GCLogin.getInstance().login();
 
-            final MapTokens tokens = GCLogin.getMapTokens();
+            final MapTokens tokens = GCLogin.getInstance().getMapTokens();
 
             {
                 final Viewport viewport = new Viewport(new Geopoint("N 52° 25.369 E 9° 35.499"), new Geopoint("N 52° 25.600 E 9° 36.200"));