1 files changed, 18 insertions, 3 deletions
diff --git a/tests/src/cgeo/geocaching/files/GPXParserTest.java b/tests/src/cgeo/geocaching/files/GPXParserTest.java
index 00e0447..5ba4081 100644
--- a/tests/src/cgeo/geocaching/files/GPXParserTest.java
+++ b/tests/src/cgeo/geocaching/files/GPXParserTest.java
@@ -36,7 +36,8 @@ public class GPXParserTest extends AbstractResourceInstrumentationTestCase {
         assertEquals(false, cache.isArchived());
         assertEquals(false, cache.isDisabled());
         assertEquals("Die Schatzinsel / treasure island", cache.getName());
-        assertEquals("Die unbesiegbaren Geo - Geparden", cache.getOwner());
+        assertEquals("Die unbesiegbaren Geo - Geparden", cache.getOwnerDisplayName());
+        assertEquals("Die unbesiegbaren Geo - Geparden", cache.getOwnerUserId());
         assertEquals(CacheSize.MICRO, cache.getSize());
         assertEquals(1.0f, cache.getDifficulty());
         assertEquals(5.0f, cache.getTerrain());
@@ -60,7 +61,8 @@ public class GPXParserTest extends AbstractResourceInstrumentationTestCase {
         assertEquals(false, cache.isArchived());
         assertEquals(false, cache.isDisabled());
         assertEquals("Die Schatzinsel / treasure island", cache.getName());
-        assertEquals("Die unbesiegbaren Geo - Geparden", cache.getOwner());
+        assertEquals("Die unbesiegbaren Geo - Geparden", cache.getOwnerDisplayName());
+        assertEquals("Die unbesiegbaren Geo - Geparden", cache.getOwnerUserId());
         assertEquals(CacheSize.SMALL, cache.getSize());
         assertEquals(1.0f, cache.getDifficulty());
         assertEquals(4.0f, cache.getTerrain());
@@ -105,6 +107,8 @@ public class GPXParserTest extends AbstractResourceInstrumentationTestCase {
         assertEquals(WaypointType.TRAILHEAD, GPXParser.convertWaypointSym2Type("Trailhead"));
         assertEquals(WaypointType.FINAL, GPXParser.convertWaypointSym2Type("Final location"));
         assertEquals(WaypointType.WAYPOINT, GPXParser.convertWaypointSym2Type("Reference point"));
+
+        assertEquals(WaypointType.PARKING, GPXParser.convertWaypointSym2Type(WaypointType.PARKING.getL10n()));
     }
 
     private static void assertGc31j2h(final cgCache cache) {
@@ -117,7 +121,8 @@ public class GPXParserTest extends AbstractResourceInstrumentationTestCase {
         assertEquals(1.0f, cache.getTerrain(), 0.01f);
         final Geopoint refCoordinates = new Geopoint("N 49° 19.122", "E 008° 32.739");
         assertEquals(refCoordinates, cache.getCoords());
-        assertEquals("vptsz", cache.getOwner());
+        assertEquals("vptsz", cache.getOwnerDisplayName());
+        assertEquals("vptsz", cache.getOwnerUserId());
         assertEquals(CacheSize.SMALL, cache.getSize());
         assertEquals(CacheType.MULTI, cache.getType());
         assertFalse(cache.isArchived());
@@ -228,4 +233,14 @@ public class GPXParserTest extends AbstractResourceInstrumentationTestCase {
         // previously these caches overwrote each other during parsing
         assertEquals(130, caches.size());
     }
+
+    public void testGeoToad() throws Exception {
+        final List<cgCache> caches = readGPX10(R.raw.geotoad);
+        assertEquals(2, caches.size());
+        cgCache cache;
+        cache = caches.get(0);
+        assertEquals("GC2KN6K", cache.getGeocode());
+        cache = caches.get(1);
+        assertEquals("GC1T3MK", cache.getGeocode());
+    }
 }