fix #2886: trackable quick search not working

* introduce separate trackable connectors
* new detection of not activated trackables
* fix geokrety urls

1 files changed, 23 insertions, 2 deletions

diff --git a/tests/src/cgeo/geocaching/TrackableTest.java b/tests/src/cgeo/geocaching/TrackableTest.java
index 2852a4d..7d3fd5c 100644
--- a/tests/src/cgeo/geocaching/TrackableTest.java
+++ b/tests/src/cgeo/geocaching/TrackableTest.java
@@ -5,8 +5,7 @@ import android.test.AndroidTestCase;
 public class TrackableTest extends AndroidTestCase {
 
     public static void testGetGeocode() {
-        final Trackable trackable = new Trackable();
-        trackable.setGeocode("tb1234");
+        final Trackable trackable = createTrackable("tb1234");
         assertEquals("TB1234", trackable.getGeocode());
     }
 
@@ -15,4 +14,26 @@ public class TrackableTest extends AndroidTestCase {
         trackable.setLogs(null);
         assertNotNull("Trackable logs must not be null!", trackable.getLogs());
     }
+
+    public static void testTrackableUrl() {
+        final Trackable trackable = createTrackable("TB1234");
+        assertEquals("http://www.geocaching.com//track/details.aspx?tracker=TB1234", trackable.getUrl());
+    }
+
+    public static void testGeokretUrl() {
+        Trackable geokret = createTrackable("GK82A2");
+        assertEquals("http://geokrety.org/konkret.php?id=33442", geokret.getUrl());
+    }
+
+    public static void testLoggable() {
+        assertTrue(createTrackable("TB1234").isLoggable());
+        assertFalse(createTrackable("GK1234").isLoggable());
+    }
+
+    private static Trackable createTrackable(String geocode) {
+        final Trackable trackable = new Trackable();
+        trackable.setGeocode(geocode);
+        return trackable;
+    }
+
 }