aboutsummaryrefslogtreecommitdiffstats
path: root/tests/src/cgeo/geocaching/cgeoApplicationTest.java
diff options
context:
space:
mode:
authorBananeweizen <Bananeweizen@gmx.de>2012-02-16 08:10:19 +0100
committerBananeweizen <Bananeweizen@gmx.de>2012-02-16 08:10:19 +0100
commit165910f327630231b131f6890df0defae28775ce (patch)
treee1fc08f4237d6b3d321b952874cfc1ec4523db69 /tests/src/cgeo/geocaching/cgeoApplicationTest.java
parentb166652df38ac6c4534856ead21acd5bfb308a5a (diff)
downloadcgeo-165910f327630231b131f6890df0defae28775ce.zip
cgeo-165910f327630231b131f6890df0defae28775ce.tar.gz
cgeo-165910f327630231b131f6890df0defae28775ce.tar.bz2
refactoring: use underscore in symbolic constants
* otherwise they are not readable
Diffstat (limited to 'tests/src/cgeo/geocaching/cgeoApplicationTest.java')
-rw-r--r--tests/src/cgeo/geocaching/cgeoApplicationTest.java20
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/src/cgeo/geocaching/cgeoApplicationTest.java b/tests/src/cgeo/geocaching/cgeoApplicationTest.java
index d61d165..4a4b51f 100644
--- a/tests/src/cgeo/geocaching/cgeoApplicationTest.java
+++ b/tests/src/cgeo/geocaching/cgeoApplicationTest.java
@@ -105,7 +105,7 @@ public class cgeoApplicationTest extends ApplicationTestCase<cgeoapplication> {
if (Settings.isPremiumMember() || search.error == null) {
assertEquals(1, search.getGeocodes().size());
assertTrue(search.getGeocodes().contains(geocode));
- return cgeoapplication.getInstance().loadCache(geocode, LoadFlags.LOADCACHEORDB);
+ return cgeoapplication.getInstance().loadCache(geocode, LoadFlags.LOAD_CACHE_OR_DB);
}
assertEquals(0, search.getGeocodes().size());
return null;
@@ -138,7 +138,7 @@ public class cgeoApplicationTest extends ApplicationTestCase<cgeoapplication> {
assertNotNull(search);
assertEquals(1, search.getGeocodes().size());
assertTrue(search.getGeocodes().contains(cache.getGeocode()));
- cgCache searchedCache = search.getFirstCacheFromResult(LoadFlags.LOADCACHEORDB);
+ cgCache searchedCache = search.getFirstCacheFromResult(LoadFlags.LOAD_CACHE_OR_DB);
// coords must be null if the user is not logged in
assertNull(searchedCache.getCoords());
@@ -210,13 +210,13 @@ public class cgeoApplicationTest extends ApplicationTestCase<cgeoapplication> {
// coords are identical... if the user is logged in
if (search.error != null) {
if (search.getGeocodes().contains(cache.getGeocode())) {
- assertFalse(cache.getCoords().isEqualTo(cgeoapplication.getInstance().loadCache(cache.getGeocode(), LoadFlags.LOADCACHEORDB).getCoords()));
- assertFalse(cgeoapplication.getInstance().loadCache(cache.getGeocode(), LoadFlags.LOADCACHEORDB).isReliableLatLon());
+ assertFalse(cache.getCoords().isEqualTo(cgeoapplication.getInstance().loadCache(cache.getGeocode(), LoadFlags.LOAD_CACHE_OR_DB).getCoords()));
+ assertFalse(cgeoapplication.getInstance().loadCache(cache.getGeocode(), LoadFlags.LOAD_CACHE_OR_DB).isReliableLatLon());
}
} else {
assertTrue(search.getGeocodes().contains(cache.getGeocode()));
- assertEquals(cache.getCoords().toString(), cgeoapplication.getInstance().loadCache(cache.getGeocode(), LoadFlags.LOADCACHEORDB).getCoords().toString());
- assertTrue(cgeoapplication.getInstance().loadCache(cache.getGeocode(), LoadFlags.LOADCACHEORDB).isReliableLatLon());
+ assertEquals(cache.getCoords().toString(), cgeoapplication.getInstance().loadCache(cache.getGeocode(), LoadFlags.LOAD_CACHE_OR_DB).getCoords().toString());
+ assertTrue(cgeoapplication.getInstance().loadCache(cache.getGeocode(), LoadFlags.LOAD_CACHE_OR_DB).isReliableLatLon());
}
}
}
@@ -246,9 +246,9 @@ public class cgeoApplicationTest extends ApplicationTestCase<cgeoapplication> {
assertTrue(search.getGeocodes().contains(cache.getGeocode()));
// coords differ
Log.d(Settings.tag, "cgeoApplicationTest.testSearchByViewportNotLoggedIn: Coords expected = " + cache.getCoords());
- Log.d(Settings.tag, "cgeoApplicationTest.testSearchByViewportNotLoggedIn: Coords actual = " + cgeoapplication.getInstance().loadCache(cache.getGeocode(), LoadFlags.LOADCACHEORDB).getCoords());
- assertFalse(cache.getCoords().isEqualTo(cgeoapplication.getInstance().loadCache(cache.getGeocode(), LoadFlags.LOADCACHEORDB).getCoords(), 1e-3));
- assertFalse(cgeoapplication.getInstance().loadCache(cache.getGeocode(), LoadFlags.LOADCACHEORDB).isReliableLatLon());
+ Log.d(Settings.tag, "cgeoApplicationTest.testSearchByViewportNotLoggedIn: Coords actual = " + cgeoapplication.getInstance().loadCache(cache.getGeocode(), LoadFlags.LOAD_CACHE_OR_DB).getCoords());
+ assertFalse(cache.getCoords().isEqualTo(cgeoapplication.getInstance().loadCache(cache.getGeocode(), LoadFlags.LOAD_CACHE_OR_DB).getCoords(), 1e-3));
+ assertFalse(cgeoapplication.getInstance().loadCache(cache.getGeocode(), LoadFlags.LOAD_CACHE_OR_DB).isReliableLatLon());
// premium cache
cache = new GC2JVEH();
@@ -295,7 +295,7 @@ public class cgeoApplicationTest extends ApplicationTestCase<cgeoapplication> {
/** Remove cache from DB and cache to ensure that the cache is not loaded from the database */
private static void deleteCacheFromDBAndLogout(String geocode) {
- cgeoapplication.getInstance().removeCache(geocode, LoadFlags.REMOVEALL);
+ cgeoapplication.getInstance().removeCache(geocode, LoadFlags.REMOVE_ALL);
cgBase.logout();
// Modify login data to avoid an automatic login again