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

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

2 files changed, 43 insertions, 3 deletions

diff --git a/tests/src/cgeo/geocaching/connector/opencaching/OCXMLTest.java b/tests/src/cgeo/geocaching/connector/oc/OCXMLTest.java
index ca2e302..b12823a 100644
--- a/tests/src/cgeo/geocaching/connector/opencaching/OCXMLTest.java
+++ b/tests/src/cgeo/geocaching/connector/oc/OCXMLTest.java
@@ -1,9 +1,8 @@
-package cgeo.geocaching.connector.opencaching;
+package cgeo.geocaching.connector.oc;
 
 import cgeo.CGeoTestCase;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.Settings;
-import cgeo.geocaching.connector.oc.OCXMLClient;
 import cgeo.geocaching.enumerations.CacheType;
 
 import java.util.Collection;
@@ -80,4 +79,45 @@ public class OCXMLTest extends CGeoTestCase {
             Settings.setExcludeMine(oldExcludeMine);
         }
     }
+
+    public static void testFetchTwiceDuplicatesDescription() {
+        final String geoCode = "OCEFBA";
+        final String description = "Bei dem Cache kannst du einen kleinen Schatz bergen. Bitte lege aber einen ander Schatz in das Döschen. Achtung vor Automuggels.";
+
+        deleteCacheFromDB(geoCode);
+        Geocache cache = OCXMLClient.getCache(geoCode);
+        assertNotNull(cache);
+        try {
+            assertEquals(geoCode, cache.getGeocode());
+            assertEquals(description, cache.getDescription());
+            cache.store(null);
+
+            // reload, make sure description is not duplicated
+            cache = OCXMLClient.getCache(geoCode);
+            assertNotNull(cache);
+            assertEquals(description, cache.getDescription());
+        } finally {
+            deleteCacheFromDB(geoCode);
+        }
+    }
+
+    public static void testRemoveMarkupCache() {
+        final String geoCode = "OCEFBA";
+        final String description = "Bei dem Cache kannst du einen kleinen Schatz bergen. Bitte lege aber einen ander Schatz in das Döschen. Achtung vor Automuggels.";
+
+        Geocache cache = OCXMLClient.getCache(geoCode);
+        assertNotNull(cache);
+        assertEquals(description, cache.getDescription());
+    }
+
+    public static void testRemoveMarkup() {
+        assertEquals("", OC11XMLParser.stripMarkup(""));
+        assertEquals("Test", OC11XMLParser.stripMarkup("Test"));
+        assertEquals("<b>bold and others not removed</b>", OC11XMLParser.stripMarkup("<b>bold and others not removed</b>"));
+        assertEquals("unnecessary paragraph", OC11XMLParser.stripMarkup("<p>unnecessary paragraph</p>"));
+        assertEquals("unnecessary span", OC11XMLParser.stripMarkup("<span>unnecessary span</span>"));
+        assertEquals("nested", OC11XMLParser.stripMarkup("<span><span>nested</span></span>"));
+        assertEquals("mixed", OC11XMLParser.stripMarkup("<span> <p> mixed </p> </span>"));
+        assertEquals("<p>not</p><p>removable</p>", OC11XMLParser.stripMarkup("<p>not</p><p>removable</p>"));
+    }
 }
diff --git a/tests/src/cgeo/geocaching/connector/opencaching/OkapiClientTest.java b/tests/src/cgeo/geocaching/connector/oc/OkapiClientTest.java
index 9173c6a..690cd4c 100644
--- a/tests/src/cgeo/geocaching/connector/opencaching/OkapiClientTest.java
+++ b/tests/src/cgeo/geocaching/connector/oc/OkapiClientTest.java
@@ -1,4 +1,4 @@
-package cgeo.geocaching.connector.opencaching;
+package cgeo.geocaching.connector.oc;
 
 import cgeo.CGeoTestCase;
 import cgeo.geocaching.Geocache;