diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/src/cgeo/geocaching/cgBaseTest.java | 2 | ||||
| -rw-r--r-- | tests/src/cgeo/geocaching/connector/ConnectorFactoryTest.java | 29 |
2 files changed, 28 insertions, 3 deletions
diff --git a/tests/src/cgeo/geocaching/cgBaseTest.java b/tests/src/cgeo/geocaching/cgBaseTest.java index 6b7c6b6..45aceca 100644 --- a/tests/src/cgeo/geocaching/cgBaseTest.java +++ b/tests/src/cgeo/geocaching/cgBaseTest.java @@ -21,7 +21,7 @@ public class cgBaseTest extends AndroidTestCase { public static void testRegEx() { String page = MockedCache.readCachePage("GC2CJPF"); assertEquals("blafoo", BaseUtils.getMatch(page, GCConstants.PATTERN_LOGIN_NAME, true, "???")); - assertEquals("Premium Member", BaseUtils.getMatch(page, GCConstants.PATTERN_MEMBER_STATUS, true, "???")); + assertTrue(page.contains("id=\"ctl00_hlRenew\"") || "Premium Member".equals(BaseUtils.getMatch(page, GCConstants.PATTERN_MEMBER_STATUS, true, "???"))); int cachesFound = Integer.parseInt(BaseUtils.getMatch(page, GCConstants.PATTERN_CACHES_FOUND, true, "0").replaceAll("[,.]", "")); assertTrue(cachesFound >= 491); } diff --git a/tests/src/cgeo/geocaching/connector/ConnectorFactoryTest.java b/tests/src/cgeo/geocaching/connector/ConnectorFactoryTest.java index 41a819f..75beb2c 100644 --- a/tests/src/cgeo/geocaching/connector/ConnectorFactoryTest.java +++ b/tests/src/cgeo/geocaching/connector/ConnectorFactoryTest.java @@ -1,13 +1,14 @@ package cgeo.geocaching.connector; import cgeo.geocaching.connector.gc.GCConnector; +import cgeo.geocaching.connector.opencaching.OpenCachingConnector; import cgeo.geocaching.test.AbstractResourceInstrumentationTestCase; import cgeo.geocaching.test.mock.GC1ZXX2; public class ConnectorFactoryTest extends AbstractResourceInstrumentationTestCase { public static void testGetConnectors() { - IConnector[] connectors = ConnectorFactory.getConnectors(); + final IConnector[] connectors = ConnectorFactory.getConnectors(); assertNotNull(connectors); assertTrue(connectors.length > 0); // unknown connector must exist } @@ -19,12 +20,36 @@ public class ConnectorFactoryTest extends AbstractResourceInstrumentationTestCas assertFalse(ConnectorFactory.canHandle("[/start with special char")); } + public static void testGeocodeOpenCaching() { + assertTrue(ConnectorFactory.getConnector("OZ12345") instanceof OpenCachingConnector); // opencaching CZ + assertTrue(ConnectorFactory.getConnector("OC12345") instanceof OpenCachingConnector); // opencaching DE + assertTrue(ConnectorFactory.getConnector("OU12345") instanceof OpenCachingConnector); // opencaching US + assertTrue(ConnectorFactory.getConnector("OK12345") instanceof OpenCachingConnector); // opencaching UK + assertTrue(ConnectorFactory.getConnector("OJ12345") instanceof OpenCachingConnector); // opencaching JP + assertTrue(ConnectorFactory.getConnector("OS12345") instanceof OpenCachingConnector); // opencaching NO + assertTrue(ConnectorFactory.getConnector("OB12345") instanceof OpenCachingConnector); // opencaching NL + assertTrue(ConnectorFactory.getConnector("OP12345") instanceof OpenCachingConnector); // opencaching PL + } + + public static void testGeocodeInvalidFormat() throws Exception { + // all codes are invalid + assertTrue(ConnectorFactory.getConnector("GC") instanceof UnknownConnector); + assertTrue(ConnectorFactory.getConnector("OC") instanceof UnknownConnector); + assertTrue(ConnectorFactory.getConnector("OX") instanceof UnknownConnector); + assertTrue(ConnectorFactory.getConnector("GC 1234") instanceof UnknownConnector); + assertTrue(ConnectorFactory.getConnector("OC 1234") instanceof UnknownConnector); + assertTrue(ConnectorFactory.getConnector("OX 1234") instanceof UnknownConnector); + assertTrue(ConnectorFactory.getConnector("GC-1234") instanceof UnknownConnector); + assertTrue(ConnectorFactory.getConnector("OC-1234") instanceof UnknownConnector); + assertTrue(ConnectorFactory.getConnector("OX-1234") instanceof UnknownConnector); + } + public static void testGetConnectorCgCache() { assertEquals(GCConnector.getInstance(), ConnectorFactory.getConnector(new GC1ZXX2())); } public static void testGetConnectorString() { - IConnector connector = ConnectorFactory.getConnector("GC12345"); + final IConnector connector = ConnectorFactory.getConnector("GC12345"); assertNotNull(connector); assertEquals(GCConnector.getInstance().getName(), connector.getName()); } |