aboutsummaryrefslogtreecommitdiffstats
path: root/tests/src
diff options
context:
space:
mode:
authorBananeweizen <bananeweizen@gmx.de>2012-05-04 17:09:38 +0200
committerBananeweizen <bananeweizen@gmx.de>2012-05-04 17:09:38 +0200
commit84c6bd6cc358b2cde2926a62990e4c151c47d6d1 (patch)
tree5d5a44f145fb347279d5c4c3a44e8a567a619930 /tests/src
parent8f7c6b683f23356864a7b6a94a4071c4614b24db (diff)
downloadcgeo-84c6bd6cc358b2cde2926a62990e4c151c47d6d1.zip
cgeo-84c6bd6cc358b2cde2926a62990e4c151c47d6d1.tar.gz
cgeo-84c6bd6cc358b2cde2926a62990e4c151c47d6d1.tar.bz2
refactoring: unify connector naming
Diffstat (limited to 'tests/src')
-rw-r--r--tests/src/cgeo/geocaching/connector/ConnectorFactoryTest.java18
-rw-r--r--tests/src/cgeo/geocaching/connector/opencaching/OkapiClientTest.java1
2 files changed, 10 insertions, 9 deletions
diff --git a/tests/src/cgeo/geocaching/connector/ConnectorFactoryTest.java b/tests/src/cgeo/geocaching/connector/ConnectorFactoryTest.java
index 75beb2c..2922272 100644
--- a/tests/src/cgeo/geocaching/connector/ConnectorFactoryTest.java
+++ b/tests/src/cgeo/geocaching/connector/ConnectorFactoryTest.java
@@ -1,7 +1,7 @@
package cgeo.geocaching.connector;
import cgeo.geocaching.connector.gc.GCConnector;
-import cgeo.geocaching.connector.opencaching.OpenCachingConnector;
+import cgeo.geocaching.connector.oc.OCConnector;
import cgeo.geocaching.test.AbstractResourceInstrumentationTestCase;
import cgeo.geocaching.test.mock.GC1ZXX2;
@@ -21,14 +21,14 @@ public class ConnectorFactoryTest extends AbstractResourceInstrumentationTestCas
}
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
+ assertTrue(ConnectorFactory.getConnector("OZ12345") instanceof OCConnector); // opencaching CZ
+ assertTrue(ConnectorFactory.getConnector("OC12345") instanceof OCConnector); // opencaching DE
+ assertTrue(ConnectorFactory.getConnector("OU12345") instanceof OCConnector); // opencaching US
+ assertTrue(ConnectorFactory.getConnector("OK12345") instanceof OCConnector); // opencaching UK
+ assertTrue(ConnectorFactory.getConnector("OJ12345") instanceof OCConnector); // opencaching JP
+ assertTrue(ConnectorFactory.getConnector("OS12345") instanceof OCConnector); // opencaching NO
+ assertTrue(ConnectorFactory.getConnector("OB12345") instanceof OCConnector); // opencaching NL
+ assertTrue(ConnectorFactory.getConnector("OP12345") instanceof OCConnector); // opencaching PL
}
public static void testGeocodeInvalidFormat() throws Exception {
diff --git a/tests/src/cgeo/geocaching/connector/opencaching/OkapiClientTest.java b/tests/src/cgeo/geocaching/connector/opencaching/OkapiClientTest.java
index 608f728..5576028 100644
--- a/tests/src/cgeo/geocaching/connector/opencaching/OkapiClientTest.java
+++ b/tests/src/cgeo/geocaching/connector/opencaching/OkapiClientTest.java
@@ -3,6 +3,7 @@ package cgeo.geocaching.connector.opencaching;
import cgeo.CGeoTestCase;
import cgeo.geocaching.cgCache;
import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.connector.oc.OkapiClient;
import cgeo.geocaching.enumerations.LoadFlags;
public class OkapiClientTest extends CGeoTestCase {