refactoring: use underscore in symbolic constants

* otherwise they are not readable

4 files changed, 21 insertions, 21 deletions

diff --git a/tests/src/cgeo/geocaching/cgBaseTest.java b/tests/src/cgeo/geocaching/cgBaseTest.java
index fa910c8..9b5ec3d 100644
--- a/tests/src/cgeo/geocaching/cgBaseTest.java
+++ b/tests/src/cgeo/geocaching/cgBaseTest.java
@@ -88,7 +88,7 @@ public class cgBaseTest extends AndroidTestCase {
             // to get the same results we have to use the date format used when the mocked data was created
             Settings.setGcCustomDate(mockedCache.getDateFormat());
             SearchResult searchResult = cgBase.parseCacheFromText(mockedCache.getData(), 0, null);
-            cgCache parsedCache = searchResult.getFirstCacheFromResult(LoadFlags.LOADCACHEORDB);
+            cgCache parsedCache = searchResult.getFirstCacheFromResult(LoadFlags.LOAD_CACHE_OR_DB);
             cgBaseTest.testCompareCaches(mockedCache, parsedCache);
         }
         Settings.setGcCustomDate(gcCustomDate);
@@ -157,6 +157,6 @@ public class cgBaseTest extends AndroidTestCase {
         // to get the same results we have to use the date format used when the mocked data was created
         Settings.setGcCustomDate(mockedCache.getDateFormat());
         final SearchResult searchResult = cgBase.parseCacheFromText(mockedCache.getData(), 0, null);
-        return searchResult.getFirstCacheFromResult(LoadFlags.LOADCACHEORDB);
+        return searchResult.getFirstCacheFromResult(LoadFlags.LOAD_CACHE_OR_DB);
     }
 }
\ No newline at end of file
diff --git a/tests/src/cgeo/geocaching/cgDataTest.java b/tests/src/cgeo/geocaching/cgDataTest.java
index 456baf5..0625585 100644
--- a/tests/src/cgeo/geocaching/cgDataTest.java
+++ b/tests/src/cgeo/geocaching/cgDataTest.java
@@ -49,8 +49,8 @@ public class cgDataTest extends ApplicationTestCase<cgeoapplication> {
             cache2.setListId(listId1);
 
             // save caches to DB (cache1=listId1, cache2=listId1)
-            app.saveCache(cache1, LoadFlags.SAVEALL);
-            app.saveCache(cache2, LoadFlags.SAVEALL);
+            app.saveCache(cache1, LoadFlags.SAVE_ALL);
+            app.saveCache(cache2, LoadFlags.SAVE_ALL);
             assertTrue(app.getAllStoredCachesCount(false, CacheType.ALL, null) >= 2);
 
             // rename list (cache1=listId1, cache2=listId1)
@@ -83,7 +83,7 @@ public class cgDataTest extends ApplicationTestCase<cgeoapplication> {
             Set<String> geocodes = new HashSet<String>();
             geocodes.add(cache1.getGeocode());
             geocodes.add(cache2.getGeocode());
-            app.removeCaches(geocodes, LoadFlags.REMOVEALL);
+            app.removeCaches(geocodes, LoadFlags.REMOVE_ALL);
 
             // remove list
             app.removeList(listId1);
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
diff --git a/tests/src/cgeo/geocaching/files/GPXImporterTest.java b/tests/src/cgeo/geocaching/files/GPXImporterTest.java
index dcc2bf6..33a1524 100644
--- a/tests/src/cgeo/geocaching/files/GPXImporterTest.java
+++ b/tests/src/cgeo/geocaching/files/GPXImporterTest.java
@@ -67,7 +67,7 @@ public class GPXImporterTest extends AbstractResourceInstrumentationTestCase {
         SearchResult search = (SearchResult) importStepHandler.messages.get(3).obj;
         assertEquals(Collections.singletonList("GC31J2H"), new ArrayList<String>(search.getGeocodes()));
 
-        cgCache cache = cgeoapplication.getInstance().loadCache("GC31J2H", LoadFlags.LOADCACHEORDB);
+        cgCache cache = cgeoapplication.getInstance().loadCache("GC31J2H", LoadFlags.LOAD_CACHE_OR_DB);
         assertCacheProperties(cache);
 
         // can't assert, for whatever reason the waypoints are remembered in DB
@@ -96,7 +96,7 @@ public class GPXImporterTest extends AbstractResourceInstrumentationTestCase {
         SearchResult search = (SearchResult) importStepHandler.messages.get(4).obj;
         assertEquals(Collections.singletonList("GC31J2H"), new ArrayList<String>(search.getGeocodes()));
 
-        cgCache cache = cgeoapplication.getInstance().loadCache("GC31J2H", LoadFlags.LOADCACHEORDB);
+        cgCache cache = cgeoapplication.getInstance().loadCache("GC31J2H", LoadFlags.LOAD_CACHE_OR_DB);
         assertCacheProperties(cache);
         assertEquals(2, cache.getWaypoints().size());
     }
@@ -119,7 +119,7 @@ public class GPXImporterTest extends AbstractResourceInstrumentationTestCase {
         SearchResult search = (SearchResult) importStepHandler.messages.get(3).obj;
         assertEquals(Collections.singletonList("OC5952"), new ArrayList<String>(search.getGeocodes()));
 
-        cgCache cache = cgeoapplication.getInstance().loadCache("OC5952", LoadFlags.LOADCACHEORDB);
+        cgCache cache = cgeoapplication.getInstance().loadCache("OC5952", LoadFlags.LOAD_CACHE_OR_DB);
         assertCacheProperties(cache);
     }
 
@@ -160,7 +160,7 @@ public class GPXImporterTest extends AbstractResourceInstrumentationTestCase {
         SearchResult search = (SearchResult) importStepHandler.messages.get(3).obj;
         assertEquals(Collections.singletonList("GC31J2H"), new ArrayList<String>(search.getGeocodes()));
 
-        cgCache cache = cgeoapplication.getInstance().loadCache("GC31J2H", LoadFlags.LOADCACHEORDB);
+        cgCache cache = cgeoapplication.getInstance().loadCache("GC31J2H", LoadFlags.LOAD_CACHE_OR_DB);
         assertCacheProperties(cache);
 
         // can't assert, for whatever reason the waypoints are remembered in DB
@@ -178,7 +178,7 @@ public class GPXImporterTest extends AbstractResourceInstrumentationTestCase {
         SearchResult search = (SearchResult) importStepHandler.messages.get(4).obj;
         assertEquals(Collections.singletonList("GC31J2H"), new ArrayList<String>(search.getGeocodes()));
 
-        cgCache cache = cgeoapplication.getInstance().loadCache("GC31J2H", LoadFlags.LOADCACHEORDB);
+        cgCache cache = cgeoapplication.getInstance().loadCache("GC31J2H", LoadFlags.LOAD_CACHE_OR_DB);
         assertCacheProperties(cache);
         assertEquals(1, cache.getWaypoints().size()); // this is the original pocket query result without test waypoint
     }
@@ -203,7 +203,7 @@ public class GPXImporterTest extends AbstractResourceInstrumentationTestCase {
         SearchResult search = (SearchResult) importStepHandler.messages.get(4).obj;
         assertEquals(Collections.singletonList("GC31J2H"), new ArrayList<String>(search.getGeocodes()));
 
-        cgCache cache = cgeoapplication.getInstance().loadCache("GC31J2H", LoadFlags.LOADCACHEORDB);
+        cgCache cache = cgeoapplication.getInstance().loadCache("GC31J2H", LoadFlags.LOAD_CACHE_OR_DB);
         assertCacheProperties(cache);
         assertEquals(1, cache.getWaypoints().size()); // this is the original pocket query result without test waypoint
     }