aboutsummaryrefslogtreecommitdiffstats
path: root/tests/src
diff options
context:
space:
mode:
Diffstat (limited to 'tests/src')
-rw-r--r--tests/src/cgeo/geocaching/cgBaseTest.java60
-rw-r--r--tests/src/cgeo/geocaching/cgeoApplicationTest.java2
-rw-r--r--tests/src/cgeo/geocaching/connector/gc/GCBaseTest.java26
3 files changed, 59 insertions, 29 deletions
diff --git a/tests/src/cgeo/geocaching/cgBaseTest.java b/tests/src/cgeo/geocaching/cgBaseTest.java
index c89e41c..5bb7f8d 100644
--- a/tests/src/cgeo/geocaching/cgBaseTest.java
+++ b/tests/src/cgeo/geocaching/cgBaseTest.java
@@ -34,46 +34,50 @@ public class cgBaseTest extends AndroidTestCase {
assertEquals(125.663703918457, (new Geopoint(48.0, 2.0)).getElevation(), 0.1);
}
- public static void testCompareCaches(ICache expected, cgCache actual) {
+ public static void testCompareCaches(ICache expected, cgCache actual, boolean all) {
assertEquals(expected.getGeocode(), actual.getGeocode());
assertTrue(expected.getType() == actual.getType());
assertEquals(expected.getOwner(), actual.getOwner());
assertEquals(expected.getDifficulty(), actual.getDifficulty());
assertEquals(expected.getTerrain(), actual.getTerrain());
- assertEquals(expected.getLatitude(), actual.getLatitude());
- assertEquals(expected.getLongitude(), actual.getLongitude());
- assertTrue(actual.isReliableLatLon());
assertEquals(expected.isDisabled(), actual.isDisabled());
- assertEquals(expected.isOwn(), actual.isOwn());
assertEquals(expected.isArchived(), actual.isArchived());
- assertEquals(expected.isPremiumMembersOnly(), actual.isPremiumMembersOnly());
- assertEquals(expected.getOwnerReal(), actual.getOwnerReal());
assertEquals(expected.getSize(), actual.getSize());
- assertEquals(expected.getHint(), actual.getHint());
- assertTrue(actual.getDescription().startsWith(expected.getDescription()));
- assertEquals(expected.getShortDescription(), actual.getShortDescription());
assertEquals(expected.getName(), actual.getName());
- assertEquals(expected.getCacheId(), actual.getCacheId());
assertEquals(expected.getGuid(), actual.getGuid());
- assertEquals(expected.getLocation(), actual.getLocation());
- assertEquals(expected.getPersonalNote(), actual.getPersonalNote());
- assertEquals(expected.isFound(), actual.isFound());
- assertEquals(expected.isFavorite(), actual.isFavorite());
assertTrue(expected.getFavoritePoints() <= actual.getFavoritePoints());
- assertEquals(expected.isWatchlist(), actual.isWatchlist());
assertEquals(expected.getHiddenDate().toString(), actual.getHiddenDate().toString());
- for (String attribute : expected.getAttributes()) {
- assertTrue(actual.getAttributes().contains(attribute));
- }
- for (LogType logType : expected.getLogCounts().keySet()) {
- assertTrue(actual.getLogCounts().get(logType) >= expected.getLogCounts().get(logType));
- }
-
- // the inventory can differ to often, therefore we don't compare them
+ assertEquals(expected.isPremiumMembersOnly(), actual.isPremiumMembersOnly());
- int actualSpoilersSize = null != actual.getSpoilers() ? actual.getSpoilers().size() : 0;
- int expectedSpoilersSize = null != expected.getSpoilers() ? expected.getSpoilers().size() : 0;
- assertEquals(expectedSpoilersSize, actualSpoilersSize);
+ if (all) {
+ assertEquals(expected.getLatitude(), actual.getLatitude());
+ assertEquals(expected.getLongitude(), actual.getLongitude());
+ assertTrue(actual.isReliableLatLon());
+ assertEquals(expected.isOwn(), actual.isOwn());
+ assertEquals(expected.getOwnerReal(), actual.getOwnerReal());
+ assertEquals(expected.getHint(), actual.getHint());
+ assertTrue(actual.getDescription().startsWith(expected.getDescription()));
+ assertEquals(expected.getShortDescription(), actual.getShortDescription());
+ assertEquals(expected.getCacheId(), actual.getCacheId());
+ assertEquals(expected.getLocation(), actual.getLocation());
+ assertEquals(expected.getPersonalNote(), actual.getPersonalNote());
+ assertEquals(expected.isFound(), actual.isFound());
+ assertEquals(expected.isFavorite(), actual.isFavorite());
+ assertEquals(expected.isWatchlist(), actual.isWatchlist());
+
+ for (String attribute : expected.getAttributes()) {
+ assertTrue(actual.getAttributes().contains(attribute));
+ }
+ for (LogType logType : expected.getLogCounts().keySet()) {
+ assertTrue(actual.getLogCounts().get(logType) >= expected.getLogCounts().get(logType));
+ }
+
+ // the inventory can differ to often, therefore we don't compare them
+
+ int actualSpoilersSize = null != actual.getSpoilers() ? actual.getSpoilers().size() : 0;
+ int expectedSpoilersSize = null != expected.getSpoilers() ? expected.getSpoilers().size() : 0;
+ assertEquals(expectedSpoilersSize, actualSpoilersSize);
+ }
}
/**
@@ -89,7 +93,7 @@ public class cgBaseTest extends AndroidTestCase {
SearchResult searchResult = cgBase.parseCacheFromText(mockedCache.getData(), null);
cgCache parsedCache = searchResult.getFirstCacheFromResult(LoadFlags.LOAD_CACHE_OR_DB);
assertTrue(StringUtils.isNotBlank(mockedCache.getMockedDataUser()));
- cgBaseTest.testCompareCaches(mockedCache, parsedCache);
+ cgBaseTest.testCompareCaches(mockedCache, parsedCache, true);
}
Settings.setGcCustomDate(gcCustomDate);
}
diff --git a/tests/src/cgeo/geocaching/cgeoApplicationTest.java b/tests/src/cgeo/geocaching/cgeoApplicationTest.java
index 0bdd3f2..0b12aa6 100644
--- a/tests/src/cgeo/geocaching/cgeoApplicationTest.java
+++ b/tests/src/cgeo/geocaching/cgeoApplicationTest.java
@@ -316,7 +316,7 @@ public class cgeoApplicationTest extends ApplicationTestCase<cgeoapplication> {
mockedCache.setMockedDataUser(Settings.getUsername());
cgCache parsedCache = cgeoApplicationTest.testSearchByGeocode(mockedCache.getGeocode());
if (null != parsedCache) {
- cgBaseTest.testCompareCaches(mockedCache, parsedCache);
+ cgBaseTest.testCompareCaches(mockedCache, parsedCache, true);
}
}
}
diff --git a/tests/src/cgeo/geocaching/connector/gc/GCBaseTest.java b/tests/src/cgeo/geocaching/connector/gc/GCBaseTest.java
index 32ab1f2..666357f 100644
--- a/tests/src/cgeo/geocaching/connector/gc/GCBaseTest.java
+++ b/tests/src/cgeo/geocaching/connector/gc/GCBaseTest.java
@@ -1,8 +1,19 @@
package cgeo.geocaching.connector.gc;
+import cgeo.geocaching.SearchResult;
+import cgeo.geocaching.cgBaseTest;
+import cgeo.geocaching.cgCache;
+import cgeo.geocaching.enumerations.LoadFlags;
+import cgeo.geocaching.test.mock.GC2CJPF;
+import cgeo.geocaching.test.mock.MockedCache;
+
+import java.util.HashSet;
+import java.util.Set;
+
import junit.framework.TestCase;
public class GCBaseTest extends TestCase {
+
public static void testSplitJSONKey() {
assertKey("(1, 2)", 1, 2);
assertKey("(12, 34)", 12, 34);
@@ -15,4 +26,19 @@ public class GCBaseTest extends TestCase {
assertEquals(x, pos.getX());
assertEquals(y, pos.getY());
}
+
+ public static void testSearchByGeocodes() {
+
+ MockedCache mockedCache = new GC2CJPF();
+
+ Set<String> geocodes = new HashSet<String>();
+ geocodes.add("GC1RMM2");//mockedCache.getGeocode());
+ //geocodes.add("GC1234");
+
+ SearchResult result = GCBase.searchByGeocodes(geocodes);
+ cgCache parsedCache = result.getFirstCacheFromResult(LoadFlags.LOAD_CACHE_ONLY);
+
+ cgBaseTest.testCompareCaches(mockedCache, parsedCache, false);
+
+ }
}
generated by cgit v1.1 at 2025-11-11 18:50:43 +0000