Merge remote-tracking branch 'upstream/master' into master-master

Conflicts:
	main/src/cgeo/geocaching/cgeocaches.java

1 files changed, 26 insertions, 0 deletions

diff --git a/tests/src/cgeo/geocaching/connector/oc/OkapiClientTest.java b/tests/src/cgeo/geocaching/connector/oc/OkapiClientTest.java
new file mode 100644
index 0000000..690cd4c
--- /dev/null
+++ b/tests/src/cgeo/geocaching/connector/oc/OkapiClientTest.java
@@ -0,0 +1,26 @@
+package cgeo.geocaching.connector.oc;
+
+import cgeo.CGeoTestCase;
+import cgeo.geocaching.Geocache;
+import cgeo.geocaching.cgData;
+import cgeo.geocaching.connector.oc.OkapiClient;
+import cgeo.geocaching.enumerations.LoadFlags;
+
+public class OkapiClientTest extends CGeoTestCase {
+
+    public static void testGetOCCache() {
+        final String geoCode = "OU0331";
+        Geocache cache = OkapiClient.getCache(geoCode);
+        assertNotNull(cache);
+        assertEquals(geoCode, cache.getGeocode());
+        assertEquals("Oshkosh Municipal Tank", cache.getName());
+        assertTrue(cache.isDetailed());
+        // cache should be stored to DB (to listID 0) when loaded above
+        cache = cgData.loadCache(geoCode, LoadFlags.LOAD_ALL_DB_ONLY);
+        assertNotNull(cache);
+        assertEquals(geoCode, cache.getGeocode());
+        assertEquals("Oshkosh Municipal Tank", cache.getName());
+        assertTrue(cache.isDetailed());
+    }
+
+}