refactoring: more cleanup in connector interfaces

* switch from method overrides to interface detection for connector
features
* remove GCBase and put code into other classes
* reduce GC specific code being used in general activities

6 files changed, 45 insertions, 28 deletions

diff --git a/tests/src/cgeo/geocaching/cgeoApplicationTest.java b/tests/src/cgeo/geocaching/cgeoApplicationTest.java
index a754375..00290b4 100644
--- a/tests/src/cgeo/geocaching/cgeoApplicationTest.java
+++ b/tests/src/cgeo/geocaching/cgeoApplicationTest.java
@@ -2,9 +2,9 @@ package cgeo.geocaching;
 
 import cgeo.CGeoTestCase;
 import cgeo.geocaching.connector.ConnectorFactory;
-import cgeo.geocaching.connector.gc.GCBase;
 import cgeo.geocaching.connector.gc.GCParser;
 import cgeo.geocaching.connector.gc.Login;
+import cgeo.geocaching.connector.gc.Tile;
 import cgeo.geocaching.enumerations.CacheType;
 import cgeo.geocaching.enumerations.LiveMapStrategy.Strategy;
 import cgeo.geocaching.enumerations.LoadFlags;
@@ -176,11 +176,11 @@ public class cgeoApplicationTest extends CGeoTestCase {
     }
 
     /**
-     * Test {@link cgBase#searchByCoords(cgSearchThread, Geopoint, String, int, boolean)}
+     * Test {@link cgBase#searchByCoords(AbstractSearchThread, Geopoint, String, int, boolean)}
      */
     @MediumTest
     public static void testSearchByCoords() {
-        final SearchResult search = GCParser.searchByCoords(null, new Geopoint("N 52° 24.972 E 009° 35.647"), CacheType.MYSTERY, false);
+        final SearchResult search = GCParser.searchByCoords(new Geopoint("N 52° 24.972 E 009° 35.647"), CacheType.MYSTERY, false);
         assertNotNull(search);
         assertTrue(18 <= search.getGeocodes().size());
         assertTrue(search.getGeocodes().contains("GC1RMM2"));
@@ -191,7 +191,7 @@ public class cgeoApplicationTest extends CGeoTestCase {
      */
     @MediumTest
     public static void testSearchByOwner() {
-        final SearchResult search = GCParser.searchByOwner(null, "blafoo", CacheType.MYSTERY, false);
+        final SearchResult search = GCParser.searchByOwner("blafoo", CacheType.MYSTERY, false);
         assertNotNull(search);
         assertEquals(3, search.getGeocodes().size());
         assertTrue(search.getGeocodes().contains("GC36RT6"));
@@ -202,7 +202,7 @@ public class cgeoApplicationTest extends CGeoTestCase {
      */
     @MediumTest
     public static void testSearchByUsername() {
-        final SearchResult search = GCParser.searchByUsername(null, "blafoo", CacheType.WEBCAM, false);
+        final SearchResult search = GCParser.searchByUsername("blafoo", CacheType.WEBCAM, false);
         assertNotNull(search);
         assertEquals(3, search.getTotal());
         assertTrue(search.getGeocodes().contains("GCP0A9"));
@@ -213,14 +213,13 @@ public class cgeoApplicationTest extends CGeoTestCase {
      */
     @MediumTest
     public static void testSearchByViewport() {
-
-        Strategy strategy = Settings.getLiveMapStrategy();
+        final Strategy strategy = Settings.getLiveMapStrategy();
 
         try {
-            GC2CJPF mockedCache = new GC2CJPF();
+            final GC2CJPF mockedCache = new GC2CJPF();
             deleteCacheFromDB(mockedCache.getGeocode());
 
-            final String[] tokens = GCBase.getTokens();
+            final String[] tokens = Login.getMapTokens();
             final Viewport viewport = new Viewport(mockedCache, 0.003, 0.003);
 
             // check coords for DETAILED
@@ -236,7 +235,7 @@ public class cgeoApplicationTest extends CGeoTestCase {
 
             // check update after switch strategy to FAST
             Settings.setLiveMapStrategy(Strategy.FAST);
-            GCBase.removeFromTileCache(mockedCache);
+            Tile.Cache.removeFromTileCache(mockedCache);
 
             search = ConnectorFactory.searchByViewport(viewport, tokens);
             assertNotNull(search);
@@ -271,7 +270,7 @@ public class cgeoApplicationTest extends CGeoTestCase {
             // non premium cache
             MockedCache cache = new GC2CJPF();
             deleteCacheFromDBAndLogout(cache.getGeocode());
-            GCBase.removeFromTileCache(cache);
+            Tile.Cache.removeFromTileCache(cache);
 
             Viewport viewport = new Viewport(cache, 0.003, 0.003);
             SearchResult search = ConnectorFactory.searchByViewport(viewport, tokens);
diff --git a/tests/src/cgeo/geocaching/connector/gc/GCBaseTest.java b/tests/src/cgeo/geocaching/connector/gc/GCBaseTest.java
index 88873a1..91ff2f9 100644
--- a/tests/src/cgeo/geocaching/connector/gc/GCBaseTest.java
+++ b/tests/src/cgeo/geocaching/connector/gc/GCBaseTest.java
@@ -22,20 +22,19 @@ public class GCBaseTest extends TestCase {
     }
 
     private static void assertKey(String key, int x, int y) {
-        UTFGridPosition pos = UTFGridPosition.fromString(key);
+        final UTFGridPosition pos = UTFGridPosition.fromString(key);
         assertEquals(x, pos.getX());
         assertEquals(y, pos.getY());
     }
 
-    public static void testSearchByGeocodes() {
+    public static void testSearchFromMap() {
+        final MockedCache mockedCache = new GC2CJPF();
 
-        MockedCache mockedCache = new GC2CJPF();
-
-        Set<String> geocodes = new HashSet<String>();
+        final Set<String> geocodes = new HashSet<String>();
         geocodes.add(mockedCache.getGeocode());
 
-        SearchResult result = GCBase.searchByGeocodes(geocodes);
-        cgCache parsedCache = result.getFirstCacheFromResult(LoadFlags.LOAD_CACHE_ONLY);
+        final SearchResult result = GCMap.searchByGeocodes(geocodes);
+        final cgCache parsedCache = result.getFirstCacheFromResult(LoadFlags.LOAD_CACHE_ONLY);
 
         Compare.assertCompareCaches(mockedCache, parsedCache, false);
 
diff --git a/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java b/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java
index f85a697..065589b 100644
--- a/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java
+++ b/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java
@@ -11,7 +11,7 @@ public class GCConnectorTest extends AbstractResourceInstrumentationTestCase {
     public static void testGetViewport() {
         Login.login();
 
-        String[] tokens = GCBase.getTokens();
+        String[] tokens = Login.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"));
@@ -31,7 +31,7 @@ public class GCConnectorTest extends AbstractResourceInstrumentationTestCase {
     }
 
     public static void testBaseCodings() {
-        assertEquals(2045702, GCBase.gccodeToGCId("GC2MEGA"));
+        assertEquals(2045702, GCConstants.gccodeToGCId("GC2MEGA"));
     }
 
     /** Tile computation with different zoom levels */
diff --git a/tests/src/cgeo/geocaching/TrackablesTest.java b/tests/src/cgeo/geocaching/connector/gc/TrackablesTest.java
index 3cb34a6..ace7c7a 100644
--- a/tests/src/cgeo/geocaching/TrackablesTest.java
+++ b/tests/src/cgeo/geocaching/connector/gc/TrackablesTest.java
@@ -1,5 +1,8 @@
-package cgeo.geocaching;
+package cgeo.geocaching.connector.gc;
 
+import cgeo.geocaching.LogEntry;
+import cgeo.geocaching.TrackableLog;
+import cgeo.geocaching.cgTrackable;
 import cgeo.geocaching.connector.gc.GCParser;
 import cgeo.geocaching.test.AbstractResourceInstrumentationTestCase;
 import cgeo.geocaching.test.R;
@@ -54,7 +57,7 @@ public class TrackablesTest extends AbstractResourceInstrumentationTestCase {
     }
 
     public void testParseTrackableWithoutReleaseDate() {
-        cgTrackable trackable = GCParser.parseTrackable(getFileContent(R.raw.tb14wfv), null, null);
+        cgTrackable trackable = GCParser.parseTrackable(getFileContent(R.raw.tb14wfv), null);
         assertNotNull(trackable);
         assertEquals("The Brickster", trackable.getName());
         assertEquals("Adrian C", trackable.getOwner());
@@ -67,11 +70,11 @@ public class TrackablesTest extends AbstractResourceInstrumentationTestCase {
     }
 
     private cgTrackable getTB2R124() {
-        return GCParser.parseTrackable(BaseUtils.replaceWhitespace(getFileContent(R.raw.trackable_tb2r124)), null, null);
+        return GCParser.parseTrackable(BaseUtils.replaceWhitespace(getFileContent(R.raw.trackable_tb2r124)), null);
     }
 
     private cgTrackable getTBXATG() {
-        return GCParser.parseTrackable(BaseUtils.replaceWhitespace(getFileContent(R.raw.trackable_tbxatg)), null, null);
+        return GCParser.parseTrackable(BaseUtils.replaceWhitespace(getFileContent(R.raw.trackable_tbxatg)), null);
     }
 
 }
diff --git a/tests/src/cgeo/geocaching/connector/ox/OXConnectorTest.java b/tests/src/cgeo/geocaching/connector/ox/OXConnectorTest.java
new file mode 100644
index 0000000..77394de
--- /dev/null
+++ b/tests/src/cgeo/geocaching/connector/ox/OXConnectorTest.java
@@ -0,0 +1,16 @@
+package cgeo.geocaching.connector.ox;
+
+import junit.framework.TestCase;
+
+public class OXConnectorTest extends TestCase {
+
+    public static void testCanHandle() {
+        // http://www.opencaching.com/api_doc/concepts/oxcodes.html
+        final OXConnector oxConnector = new OXConnector();
+        assertTrue(oxConnector.canHandle("OXZZZZZ"));
+        assertTrue(oxConnector.canHandle("OX1"));
+        assertFalse(oxConnector.canHandle("GCABCDE"));
+        assertFalse(oxConnector.canHandle("OX_"));
+    }
+
+}
diff --git a/tests/src/cgeo/geocaching/utils/CryptUtilsTest.java b/tests/src/cgeo/geocaching/utils/CryptUtilsTest.java
index e42df3f..5dafce7 100644
--- a/tests/src/cgeo/geocaching/utils/CryptUtilsTest.java
+++ b/tests/src/cgeo/geocaching/utils/CryptUtilsTest.java
@@ -1,6 +1,6 @@
 package cgeo.geocaching.utils;
 
-import cgeo.geocaching.connector.gc.GCBase;
+import cgeo.geocaching.connector.gc.GCConstants;
 
 import junit.framework.TestCase;
 
@@ -13,8 +13,8 @@ public class CryptUtilsTest extends TestCase {
     }
 
     public static void testConvertToGcBase31() {
-        assertEquals(1186660, GCBase.gccodeToGCId("GC1PKK9"));
-        assertEquals(4660, GCBase.gccodeToGCId("GC1234"));
-        assertEquals(61731, GCBase.gccodeToGCId("GCF123"));
+        assertEquals(1186660, GCConstants.gccodeToGCId("GC1PKK9"));
+        assertEquals(4660, GCConstants.gccodeToGCId("GC1234"));
+        assertEquals(61731, GCConstants.gccodeToGCId("GCF123"));
     }
 }