Merge branch 'master' into chooselist

2 files changed, 38 insertions, 1 deletions

diff --git a/main/src/cgeo/geocaching/connector/oc/OC11XMLParser.java b/main/src/cgeo/geocaching/connector/oc/OC11XMLParser.java
index ec53a7f..fcd5cbd 100644
--- a/main/src/cgeo/geocaching/connector/oc/OC11XMLParser.java
+++ b/main/src/cgeo/geocaching/connector/oc/OC11XMLParser.java
@@ -518,7 +518,7 @@ public class OC11XMLParser {
                 if (cache != null && logHolder.logEntry.type != LogType.UNKNOWN) {
                     logs.put(logHolder.id, logHolder.logEntry);
                     cache.getLogs().add(0, logHolder.logEntry);
-                    if (logHolder.logEntry.type == LogType.FOUND_IT
+                    if ((logHolder.logEntry.type == LogType.FOUND_IT || logHolder.logEntry.type == LogType.ATTENDED)
                             && StringUtils.equalsIgnoreCase(logHolder.logEntry.author, Settings.getOCConnectorUserName())) {
                         cache.setFound(true);
                         cache.setVisitedDate(logHolder.logEntry.date);
diff --git a/tests/src/cgeo/geocaching/connector/opencaching/OCXMLTest.java b/tests/src/cgeo/geocaching/connector/opencaching/OCXMLTest.java
new file mode 100644
index 0000000..7cfd261
--- /dev/null
+++ b/tests/src/cgeo/geocaching/connector/opencaching/OCXMLTest.java
@@ -0,0 +1,37 @@
+package cgeo.geocaching.connector.opencaching;
+
+import cgeo.CGeoTestCase;
+import cgeo.geocaching.Geocache;
+import cgeo.geocaching.Settings;
+import cgeo.geocaching.connector.oc.OCXMLClient;
+import cgeo.geocaching.enumerations.CacheType;
+
+public class OCXMLTest extends CGeoTestCase {
+
+    public static void testOCGetCache() {
+        String geoCode = "OCDE76";
+
+        Geocache cache = OCXMLClient.getCache(geoCode);
+        assertNotNull(cache);
+        assertEquals(geoCode, cache.getGeocode());
+        assertEquals("Gitarrenspielplatz", cache.getName());
+        assertEquals(CacheType.TRADITIONAL, cache.getType());
+        assertEquals(2.0, cache.getDifficulty(), 0.1);
+        assertEquals(2.0, cache.getTerrain(), 0.1);
+    }
+
+    public static void testOCLogAttendedAsFound() {
+
+        String oldOCName = Settings.getOCConnectorUserName();
+        try {
+            Settings.setOCConnectorUserName("ra_sch");
+            String geoCode = "OCD541";
+            Geocache cache = OCXMLClient.getCache(geoCode);
+            assertNotNull(cache);
+
+            assertTrue(cache.isFound());
+        } finally {
+            Settings.setOCConnectorUserName(oldOCName);
+        }
+    }
+}