fix #2250: "Scan QR code" doesn't work anymore

2 files changed, 11 insertions, 0 deletions

diff --git a/tests/src/cgeo/geocaching/connector/ConnectorFactoryTest.java b/tests/src/cgeo/geocaching/connector/ConnectorFactoryTest.java
index 2bbe0d0..e8abb91 100644
--- a/tests/src/cgeo/geocaching/connector/ConnectorFactoryTest.java
+++ b/tests/src/cgeo/geocaching/connector/ConnectorFactoryTest.java
@@ -59,4 +59,10 @@ public class ConnectorFactoryTest extends AbstractResourceInstrumentationTestCas
         assertTrue(ConnectorFactory.getConnector("   OZ 12345   ") instanceof UnknownConnector);
     }
 
+    public static void testGetGeocodeFromUrl() {
+        assertEquals("GC34PLO", ConnectorFactory.getGeocodeFromURL("http://coord.info/GC34PLO"));
+        assertEquals("OX1234", ConnectorFactory.getGeocodeFromURL("http://www.opencaching.com/#!geocache/OX1234"));
+        // make sure that a mixture of different connector and geocode is recognized as invalid
+        assertNull(ConnectorFactory.getGeocodeFromURL("http://www.opencaching.com/#!geocache/" + "GC12345"));
+    }
 }
diff --git a/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java b/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java
index ca1c058..ea46bbe 100644
--- a/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java
+++ b/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java
@@ -72,5 +72,10 @@ public class GCConnectorTest extends AbstractResourceInstrumentationTestCase {
         assertEquals(x, tile.getX());
         assertEquals(y, tile.getY());
     }
+
+    public static void testGetGeocodeFromUrl() {
+        assertNull(GCConnector.getInstance().getGeocodeFromUrl("some string"));
+        assertEquals("GC12ABC", GCConnector.getInstance().getGeocodeFromUrl("http://coord.info/GC12ABC"));
+    }
 }