Merge remote-tracking branch 'origin/release'

Conflicts:
	main/src/cgeo/geocaching/connector/ConnectorFactory.java

4 files changed, 1 insertions, 138 deletions

diff --git a/tests/res/raw/ox1ry0y_gpx.gpx b/tests/res/raw/ox1ry0y_gpx.gpx
deleted file mode 100644
index e425131..0000000
--- a/tests/res/raw/ox1ry0y_gpx.gpx
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<gpx xmlns="http://www.topografix.com/GPX/1/0" xmlns:groundspeak="http://www.groundspeak.com/cache/1/0" xmlns:ns3="http://www.groundspeak.com/cache/1/0/1" xmlns:ns4="http://www.gsak.net/xmlv1/5" xmlns:ox="http://www.opencaching.com/xmlschemas/opencaching/1/0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" creator="OpenCaching" version="1.0" xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd http://www.opencaching.com/xmlschemas/opencaching/1/0 http://www.opencaching.com/xmlschemas/opencaching/1/0/opencaching.xsd http://www.groundspeak.com/cache/1/0 http://www.groundspeak.com/cache/1/0/cache.xsd">
-    <name>OpenCaching GPX</name>
-    <desc>1 geocache.  Terms of Use: http://www.opencaching.com/#terms</desc>
-    <author>OpenCaching</author>
-    <email>site@OpenCaching.com</email>
-    <url>http://www.opencaching.com/api/geocache/OX1RY0Y.gpx</url>
-    <time>2013-06-09T06:24:06.311Z</time>
-    <keywords>geocache, cache, opencaching, waypoint, ox</keywords>
-    <wpt lon="9.1836" lat="48.8642167">
-        <time>2010-12-17T15:51:11.000Z</time>
-        <name>OX1RY0Y</name>
-        <desc>Kornwestheim und die Römer by Thomas&amp;Dani, Traditional Cache(1.5/1.0/2.8)</desc>
-        <url>http://www.opencaching.com/#geocache/OX1RY0Y</url>
-        <urlname>Kornwestheim und die Römer</urlname>
-        <sym>Geocache</sym>
-        <type>Geocache|Traditional Cache</type>
-        <groundspeak:cache archived="False" available="True" id="1666403">
-            <groundspeak:name>Kornwestheim und die Römer</groundspeak:name>
-            <groundspeak:placed_by>Thomas&amp;Dani</groundspeak:placed_by>
-            <groundspeak:owner id="6809">Thomas&amp;Dani</groundspeak:owner>
-            <groundspeak:type>Traditional Cache</groundspeak:type>
-            <groundspeak:container>Small</groundspeak:container>
-            <groundspeak:difficulty>1.5</groundspeak:difficulty>
-            <groundspeak:terrain>1</groundspeak:terrain>
-            <groundspeak:long_description html="True">Dieses sind die Reste einer in Kornwestheim gefundenen römischen Wasserleitung. Sie stammt aus dem 1. bis 3. Jahrhundert n. Chr. Die Wasserleitung versorgte in etwas den Bereich der heutigen Innenstadt. Unklar ist, aus welcher Quelle das Wasser entnommen wurde. Als Material wurde Stubensandstein verwendet. Die Rinnen waren zwischen 1 bis 2 Meter lang und im leichten Gefälle (ca. 1%) verlegt. Die Stoßfugen der Rinnen waren mit Blei abgedichtet.&lt;br/&gt;&lt;br/&gt;Dieses ist unser Erstlingswerk. Nach über 1000 Founds wurde es glaube auch mal Zeit.&lt;br/&gt;&lt;br/&gt;Es ist ein gewöhnlicher Tradi. Bitte seid vorsichtig beim suchen und beim wieder verstecken. Ihr werdet von allen Seiten beobachtet.&lt;br/&gt;&lt;br/&gt;Viel spaß beim Cachen&lt;br/&gt;&lt;br/&gt;Thomas&amp;Dani  </groundspeak:long_description>
-            <groundspeak:encoded_hints>Wasserleitung</groundspeak:encoded_hints>
-            <groundspeak:logs>
-                <groundspeak:log id="2559652">
-                    <groundspeak:date>2013-04-20T22:00:00.000Z</groundspeak:date>
-                    <groundspeak:type>Found it</groundspeak:type>
-                    <groundspeak:finder id="191958">kb1991</groundspeak:finder>
-                    <groundspeak:text encoded="False">Mein erster Cache :D
-Ist leider etwas nass in der Dose...
-Macht trotzdem super viel Spaß und bin weiterhin dabei :)</groundspeak:text>
-                </groundspeak:log>
-                <groundspeak:log id="2527772">
-                    <groundspeak:date>2013-03-28T23:00:00.000Z</groundspeak:date>
-                    <groundspeak:type>Found it</groundspeak:type>
-                    <groundspeak:finder id="187186">BHM_Ausflug</groundspeak:finder>
-                    <groundspeak:text encoded="False">kleiner Spaziergang und um 15:56 Uhr haben wir geloggt :-), hier laufen wirklich einige Leute rum....</groundspeak:text>
-                </groundspeak:log>
-                <groundspeak:log id="2211102">
-                    <groundspeak:date>2012-11-01T15:56:33.000Z</groundspeak:date>
-                    <groundspeak:type>Found it</groundspeak:type>
-                    <groundspeak:finder id="160085">FalkPfeifer</groundspeak:finder>
-                    <groundspeak:text encoded="False">
-Aufgezeichnet über OpenCaching für iPhone</groundspeak:text>
-                </groundspeak:log>
-                <groundspeak:log id="1283223">
-                    <groundspeak:date>2011-06-08T20:54:09.000Z</groundspeak:date>
-                    <groundspeak:type>Found it</groundspeak:type>
-                    <groundspeak:finder id="28349">Karica</groundspeak:finder>
-                    <groundspeak:text encoded="False"/>
-                </groundspeak:log>
-                <groundspeak:log id="1088277">
-                    <groundspeak:date>2010-10-09T22:00:00.000Z</groundspeak:date>
-                    <groundspeak:type>Found it</groundspeak:type>
-                    <groundspeak:finder id="11188">John_T_Clark</groundspeak:finder>
-                    <groundspeak:text encoded="False">Nach langen suchen doch gefunden.
-
-Danke</groundspeak:text>
-                </groundspeak:log>
-            </groundspeak:logs>
-        </groundspeak:cache>
-        <ox:opencaching>
-            <ox:ratings>
-                <ox:awesomeness>2.8</ox:awesomeness>
-                <ox:difficulty>1.5</ox:difficulty>
-                <ox:size>2.8</ox:size>
-                <ox:terrain>1.0</ox:terrain>
-            </ox:ratings>
-        </ox:opencaching>
-    </wpt>
-</gpx>
diff --git a/tests/src/cgeo/geocaching/connector/ConnectorFactoryTest.java b/tests/src/cgeo/geocaching/connector/ConnectorFactoryTest.java
index e793350..5bc2260 100644
--- a/tests/src/cgeo/geocaching/connector/ConnectorFactoryTest.java
+++ b/tests/src/cgeo/geocaching/connector/ConnectorFactoryTest.java
@@ -68,7 +68,6 @@ public class ConnectorFactoryTest extends AbstractResourceInstrumentationTestCas
     public static void testGetGeocodeFromUrl() {
         assertThat(ConnectorFactory.getGeocodeFromURL("http://coord.info/GC34PLO")).isEqualTo("GC34PLO");
         assertThat(ConnectorFactory.getGeocodeFromURL("http://www.coord.info/GC34PLO")).isEqualTo("GC34PLO");
-        assertThat(ConnectorFactory.getGeocodeFromURL("http://www.opencaching.com/#!geocache/OX1234")).isEqualTo("OX1234");
 
         assertThat(GCConnector.getInstance().getGeocodeFromUrl("http://coord.info/GC12ABC")).isEqualTo("GC12ABC");
         assertThat(GCConnector.getInstance().getGeocodeFromUrl("http://www.coord.info/GC12ABC")).isEqualTo("GC12ABC");
@@ -100,10 +99,9 @@ public class ConnectorFactoryTest extends AbstractResourceInstrumentationTestCas
     }
 
     public static Set<String> getGeocodeSample() {
-        Set<String> geocodes = new HashSet<>(18);
+        final Set<String> geocodes = new HashSet<>(18);
         geocodes.add("GC1234");
         geocodes.add("OC1234");
-        geocodes.add("OX1234");
         geocodes.add("EC1234");
         geocodes.add("TCABC");
         geocodes.add("WM1234");
@@ -113,7 +111,6 @@ public class ConnectorFactoryTest extends AbstractResourceInstrumentationTestCas
 
         geocodes.add("GC5678");
         geocodes.add("OC5678");
-        geocodes.add("OX5678");
         geocodes.add("EC5678");
         geocodes.add("TC2JP");
         geocodes.add("WM5678");
diff --git a/tests/src/cgeo/geocaching/connector/ox/OXConnectorTest.java b/tests/src/cgeo/geocaching/connector/ox/OXConnectorTest.java
deleted file mode 100644
index c957912..0000000
--- a/tests/src/cgeo/geocaching/connector/ox/OXConnectorTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package cgeo.geocaching.connector.ox;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import cgeo.geocaching.connector.ConnectorFactory;
-import cgeo.geocaching.connector.ConnectorFactoryTest;
-import cgeo.geocaching.connector.IConnector;
-
-import junit.framework.TestCase;
-
-import java.util.Set;
-
-public class OXConnectorTest extends TestCase {
-
-    private static IConnector getOXConnector() {
-        final IConnector oxConnector = ConnectorFactory.getConnector("OXZZZZZ");
-        assertThat(oxConnector).isNotNull();
-        return oxConnector;
-    }
-
-    public static void testCanHandle() {
-        // http://www.opencaching.com/api_doc/concepts/oxcodes.html
-        final IConnector oxConnector = getOXConnector();
-        assertThat(oxConnector.canHandle("OXZZZZZ")).isTrue();
-        assertThat(oxConnector.canHandle("OX1")).isTrue();
-        assertThat(oxConnector.canHandle("GCABCDE")).isFalse();
-        assertThat(oxConnector.canHandle("OX_")).isFalse();
-    }
-
-    public static void testGetGeocodeFromUrl() {
-        final IConnector connector = getOXConnector();
-        assertThat(connector.getGeocodeFromUrl("http://www.opencaching.com/de/#!geocache/OX1R421")).isEqualTo("OX1R421");
-        assertThat(connector.getGeocodeFromUrl("http://www.opencaching.com/#!geocache/OX1R421")).isEqualTo("OX1R421");
-    }
-
-    public static void testHandledGeocodes() {
-        Set<String> geocodes = ConnectorFactoryTest.getGeocodeSample();
-        assertThat(getOXConnector().handledGeocodes(geocodes)).containsOnly("OX1234", "OX5678");
-    }
-}
diff --git a/tests/src/cgeo/geocaching/files/GPXParserTest.java b/tests/src/cgeo/geocaching/files/GPXParserTest.java
index d39d002..7fe3aef 100644
--- a/tests/src/cgeo/geocaching/files/GPXParserTest.java
+++ b/tests/src/cgeo/geocaching/files/GPXParserTest.java
@@ -342,25 +342,6 @@ public class GPXParserTest extends AbstractResourceInstrumentationTestCase {
         assertThat(String.valueOf(GCConstants.gccodeToGCId(cache.getGeocode()))).isEqualTo(cache.getCacheId());
     }
 
-    public void testOX() throws IOException, ParserException {
-        final List<Geocache> caches = readGPX10(R.raw.ox1ry0y_gpx);
-        assertThat(caches).hasSize(1);
-        final Geocache cache = caches.get(0);
-        assertThat(cache.getGeocode()).isEqualTo("OX1RY0Y");
-        assertThat(cache.getType()).isEqualTo(CacheType.TRADITIONAL);
-        assertThat(cache.isArchived()).isEqualTo(false);
-        assertThat(cache.isDisabled()).isEqualTo(false);
-        assertThat(cache.getName()).isEqualTo("Kornwestheim und die Römer");
-        assertThat(cache.getOwnerDisplayName()).isEqualTo("Thomas&Dani");
-        assertThat(cache.getSize()).isEqualTo(CacheSize.SMALL);
-        assertThat(cache.getDifficulty()).isEqualTo(1.5f);
-        assertThat(cache.getTerrain()).isEqualTo(1.0f);
-        assertThat(cache.getDescription().startsWith("Dieses sind die Reste einer in Kornwestheim gefundenen")).isTrue();
-        assertThat(cache.getCoords()).isEqualTo(new Geopoint(48.8642167, 9.1836));
-        assertThat(cache.isReliableLatLon()).isTrue();
-        assertThat(cache.getHint()).isEqualTo("Wasserleitung");
-    }
-
     private Geocache getFirstCache(final int gpxResourceId) throws IOException, ParserException {
         final List<Geocache> caches = readGPX10(gpxResourceId);
         assertThat(caches).isNotNull();