#1744: user name wrongly parsed/written in GPX import/export

6 files changed, 16 insertions, 13 deletions

diff --git a/tests/src/cgeo/geocaching/cgeoApplicationTest.java b/tests/src/cgeo/geocaching/cgeoApplicationTest.java
index e34fe76..fa0a4b9 100644
--- a/tests/src/cgeo/geocaching/cgeoApplicationTest.java
+++ b/tests/src/cgeo/geocaching/cgeoApplicationTest.java
@@ -385,7 +385,7 @@ public class cgeoApplicationTest extends CGeoTestCase {
         Assert.assertEquals("California, United States", GCV2R9.getLocation());
 
         cgCache GC1ZXEZ = cgeoApplicationTest.testSearchByGeocode("GC1ZXEZ");
-        Assert.assertEquals("Ms.Marple/Mr.Stringer", GC1ZXEZ.getOwnerReal());
+        Assert.assertEquals("Ms.Marple/Mr.Stringer", GC1ZXEZ.getOwnerUserId());
     }
 
     /** Remove cache from DB and cache to ensure that the cache is not loaded from the database */
diff --git a/tests/src/cgeo/geocaching/files/GPXParserTest.java b/tests/src/cgeo/geocaching/files/GPXParserTest.java
index 00e0447..53b6c33 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());
@@ -117,7 +119,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());
diff --git a/tests/src/cgeo/geocaching/test/mock/GC1ZXX2.java b/tests/src/cgeo/geocaching/test/mock/GC1ZXX2.java
index 86075c4..ce13e4a 100644
--- a/tests/src/cgeo/geocaching/test/mock/GC1ZXX2.java
+++ b/tests/src/cgeo/geocaching/test/mock/GC1ZXX2.java
@@ -36,7 +36,7 @@ public class GC1ZXX2 extends MockedCache {
     }
 
     @Override
-    public String getOwner() {
+    public String getOwnerDisplayName() {
         return "Rich Uncle Pennybags";
     }
 
@@ -61,7 +61,7 @@ public class GC1ZXX2 extends MockedCache {
     }
 
     @Override
-    public String getOwnerReal() {
+    public String getOwnerUserId() {
         return "daniel354";
     }
 
diff --git a/tests/src/cgeo/geocaching/test/mock/GC2CJPF.java b/tests/src/cgeo/geocaching/test/mock/GC2CJPF.java
index 1ea749a..40bc0da 100644
--- a/tests/src/cgeo/geocaching/test/mock/GC2CJPF.java
+++ b/tests/src/cgeo/geocaching/test/mock/GC2CJPF.java
@@ -37,12 +37,12 @@ public class GC2CJPF extends MockedCache {
     }
 
     @Override
-    public String getOwner() {
+    public String getOwnerDisplayName() {
         return "Tom03";
     }
     @Override
-    public String getOwnerReal() {
-        return getOwner();
+    public String getOwnerUserId() {
+        return getOwnerDisplayName();
     }
 
     @Override
diff --git a/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java b/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java
index d81d27a..ba64c60 100644
--- a/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java
+++ b/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java
@@ -53,12 +53,12 @@ public class GC2JVEH extends MockedCache {
     }
 
     @Override
-    public String getOwner() {
+    public String getOwnerDisplayName() {
         return "indianerjones, der merlyn,reflektordetektor";
     }
 
     @Override
-    public String getOwnerReal() {
+    public String getOwnerUserId() {
         return "indianerjones";
     }
 
diff --git a/tests/src/cgeo/test/Compare.java b/tests/src/cgeo/test/Compare.java
index 817addc..4d0e08e 100644
--- a/tests/src/cgeo/test/Compare.java
+++ b/tests/src/cgeo/test/Compare.java
@@ -12,7 +12,7 @@ public abstract class Compare {
     public static void assertCompareCaches(ICache expected, cgCache actual, boolean all) {
         assertEquals(expected.getGeocode(), actual.getGeocode());
         assertTrue(expected.getType() == actual.getType());
-        assertEquals(expected.getOwner(), actual.getOwner());
+        assertEquals(expected.getOwnerDisplayName(), actual.getOwnerDisplayName());
         assertEquals(expected.getDifficulty(), actual.getDifficulty());
         assertEquals(expected.getTerrain(), actual.getTerrain());
         assertEquals(expected.isDisabled(), actual.isDisabled());
@@ -28,7 +28,7 @@ public abstract class Compare {
             assertEquals(expected.getCoords(), actual.getCoords());
             assertTrue(actual.isReliableLatLon());
             assertEquals(expected.isOwn(), actual.isOwn());
-            assertEquals(expected.getOwnerReal(), actual.getOwnerReal());
+            assertEquals(expected.getOwnerUserId(), actual.getOwnerUserId());
             assertEquals(expected.getHint(), actual.getHint());
             assertTrue(actual.getDescription().startsWith(expected.getDescription()));
             assertEquals(expected.getShortDescription(), actual.getShortDescription());