aboutsummaryrefslogtreecommitdiffstats
path: root/tests/src
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2013-01-23 12:13:47 +0100
committerSamuel Tardieu <sam@rfc1149.net>2013-01-23 13:12:28 +0100
commit66aa9e5341c73819eb3c0e53330d4e8144f268e2 (patch)
treeccd0ba514d61f7ed53e6f128d7c8a5b456555e5b /tests/src
parent2253e295e5a6fc1fb40c5dfaed1ce8e00c1e8088 (diff)
downloadcgeo-66aa9e5341c73819eb3c0e53330d4e8144f268e2.zip
cgeo-66aa9e5341c73819eb3c0e53330d4e8144f268e2.tar.gz
cgeo-66aa9e5341c73819eb3c0e53330d4e8144f268e2.tar.bz2
fix #2322: GPX imported caches not marked as owned
The "isOwner()" property (previously named "isOwn()") is now synthesized by comparing the username with the cache owner name.
Diffstat (limited to 'tests/src')
-rw-r--r--tests/src/cgeo/geocaching/files/GPXParserTest.java2
-rw-r--r--tests/src/cgeo/geocaching/test/mock/GC2CJPF.java4
-rw-r--r--tests/src/cgeo/geocaching/test/mock/MockedCache.java2
-rw-r--r--tests/src/cgeo/test/Compare.java2
4 files changed, 5 insertions, 5 deletions
diff --git a/tests/src/cgeo/geocaching/files/GPXParserTest.java b/tests/src/cgeo/geocaching/files/GPXParserTest.java
index c195953..33c8c1a 100644
--- a/tests/src/cgeo/geocaching/files/GPXParserTest.java
+++ b/tests/src/cgeo/geocaching/files/GPXParserTest.java
@@ -140,7 +140,7 @@ public class GPXParserTest extends AbstractResourceInstrumentationTestCase {
assertFalse(cache.isDisabled());
assertFalse(cache.isEventCache());
assertFalse(cache.isPremiumMembersOnly());
- assertFalse(cache.isOwn());
+ assertFalse(cache.isOwner());
assertTrue(cache.isFound());
assertEquals("Station3: Der zerbrochene Stein zählt doppelt.\nFinal: Oben neben dem Tor", cache.getHint());
// logs
diff --git a/tests/src/cgeo/geocaching/test/mock/GC2CJPF.java b/tests/src/cgeo/geocaching/test/mock/GC2CJPF.java
index cc19eb3..d6601d5 100644
--- a/tests/src/cgeo/geocaching/test/mock/GC2CJPF.java
+++ b/tests/src/cgeo/geocaching/test/mock/GC2CJPF.java
@@ -103,11 +103,11 @@ public class GC2CJPF extends MockedCache {
* @see cgeo.geocaching.test.mock.MockedCache#isOwn()
*/
@Override
- public boolean isOwn() {
+ public boolean isOwner() {
if ("Tom03".equals(Settings.getUsername())) {
return true;
}
- return super.isOwn();
+ return super.isOwner();
}
@Override
diff --git a/tests/src/cgeo/geocaching/test/mock/MockedCache.java b/tests/src/cgeo/geocaching/test/mock/MockedCache.java
index 352c34d..d2f7eac 100644
--- a/tests/src/cgeo/geocaching/test/mock/MockedCache.java
+++ b/tests/src/cgeo/geocaching/test/mock/MockedCache.java
@@ -94,7 +94,7 @@ public abstract class MockedCache implements ICache {
}
@Override
- public boolean isOwn() {
+ public boolean isOwner() {
return false;
}
diff --git a/tests/src/cgeo/test/Compare.java b/tests/src/cgeo/test/Compare.java
index 4d0e08e..71c0976 100644
--- a/tests/src/cgeo/test/Compare.java
+++ b/tests/src/cgeo/test/Compare.java
@@ -27,7 +27,7 @@ public abstract class Compare {
if (all) {
assertEquals(expected.getCoords(), actual.getCoords());
assertTrue(actual.isReliableLatLon());
- assertEquals(expected.isOwn(), actual.isOwn());
+ assertEquals(expected.isOwner(), actual.isOwner());
assertEquals(expected.getOwnerUserId(), actual.getOwnerUserId());
assertEquals(expected.getHint(), actual.getHint());
assertTrue(actual.getDescription().startsWith(expected.getDescription()));