diff options
Diffstat (limited to 'tests')
4 files changed, 10 insertions, 10 deletions
diff --git a/tests/src/cgeo/CGeoTestCase.java b/tests/src/cgeo/CGeoTestCase.java index 7dd5956..5759bc7 100644 --- a/tests/src/cgeo/CGeoTestCase.java +++ b/tests/src/cgeo/CGeoTestCase.java @@ -39,7 +39,7 @@ public abstract class CGeoTestCase extends ApplicationTestCase<CgeoApplication> */ protected static void removeCacheCompletely(final String geocode) { final EnumSet<RemoveFlag> flags = EnumSet.copyOf(LoadFlags.REMOVE_ALL); - flags.add(RemoveFlag.REMOVE_OWN_WAYPOINTS_ONLY_FOR_TESTING); + flags.add(RemoveFlag.OWN_WAYPOINTS_ONLY_FOR_TESTING); DataStore.removeCache(geocode, flags); } diff --git a/tests/src/cgeo/geocaching/DataStoreTest.java b/tests/src/cgeo/geocaching/DataStoreTest.java index 93d76a1..3579cc5 100644 --- a/tests/src/cgeo/geocaching/DataStoreTest.java +++ b/tests/src/cgeo/geocaching/DataStoreTest.java @@ -121,7 +121,7 @@ public class DataStoreTest extends CGeoTestCase { cache.setInventory(inventory); try { - DataStore.saveCache(cache, EnumSet.of(SaveFlag.SAVE_DB)); + DataStore.saveCache(cache, EnumSet.of(SaveFlag.DB)); final Geocache loadedCache = DataStore.loadCache(GEOCODE_CACHE, LoadFlags.LOAD_ALL_DB_ONLY); assertThat(loadedCache).overridingErrorMessage("Cache was not saved.").isNotNull(); assertThat(loadedCache.getInventory()).hasSize(1); @@ -147,7 +147,7 @@ public class DataStoreTest extends CGeoTestCase { final Geocache oldCache = DataStore.loadCache(upperCase, LoadFlags.LOAD_ALL_DB_ONLY); assertThat(oldCache).as("Old cache").isNull(); - DataStore.saveCache(cache, EnumSet.of(SaveFlag.SAVE_DB)); + DataStore.saveCache(cache, EnumSet.of(SaveFlag.DB)); final Geocache cacheWithOriginalCode = DataStore.loadCache(upperCase, LoadFlags.LOAD_ALL_DB_ONLY); assertThat(cacheWithOriginalCode).overridingErrorMessage("Cache was not saved correctly!").isNotNull(); @@ -210,11 +210,11 @@ public class DataStoreTest extends CGeoTestCase { inTileHighZoom.setCoords(new Geopoint("N49 44.001 E8 37.001"), Tile.ZOOMLEVEL_MIN_PERSONALIZED + 1); // put in cache - DataStore.saveCache(main, EnumSet.of(SaveFlag.SAVE_CACHE)); - DataStore.saveCache(inTileLowZoom, EnumSet.of(SaveFlag.SAVE_CACHE)); - DataStore.saveCache(inTileHighZoom, EnumSet.of(SaveFlag.SAVE_CACHE)); - DataStore.saveCache(outTile, EnumSet.of(SaveFlag.SAVE_CACHE)); - DataStore.saveCache(otherConnector, EnumSet.of(SaveFlag.SAVE_CACHE)); + DataStore.saveCache(main, EnumSet.of(SaveFlag.CACHE)); + DataStore.saveCache(inTileLowZoom, EnumSet.of(SaveFlag.CACHE)); + DataStore.saveCache(inTileHighZoom, EnumSet.of(SaveFlag.CACHE)); + DataStore.saveCache(outTile, EnumSet.of(SaveFlag.CACHE)); + DataStore.saveCache(otherConnector, EnumSet.of(SaveFlag.CACHE)); final SearchResult search = new SearchResult(main); diff --git a/tests/src/cgeo/geocaching/files/GPXParserTest.java b/tests/src/cgeo/geocaching/files/GPXParserTest.java index 1f97fa3..6171bab 100644 --- a/tests/src/cgeo/geocaching/files/GPXParserTest.java +++ b/tests/src/cgeo/geocaching/files/GPXParserTest.java @@ -285,7 +285,7 @@ public class GPXParserTest extends AbstractResourceInstrumentationTestCase { assertThat(caches).hasSize(1); DataStore.removeAllFromCache(); // load only the minimum cache, it has several members missing - final Geocache minimalCache = DataStore.loadCache(geocode, EnumSet.of(LoadFlag.LOAD_DB_MINIMAL)); + final Geocache minimalCache = DataStore.loadCache(geocode, EnumSet.of(LoadFlag.DB_MINIMAL)); // now check that we load lazy members on demand assertThat(minimalCache.getAttributes()).isNotEmpty(); diff --git a/tests/src/cgeo/geocaching/test/AbstractResourceInstrumentationTestCase.java b/tests/src/cgeo/geocaching/test/AbstractResourceInstrumentationTestCase.java index cbad794..eaac181 100644 --- a/tests/src/cgeo/geocaching/test/AbstractResourceInstrumentationTestCase.java +++ b/tests/src/cgeo/geocaching/test/AbstractResourceInstrumentationTestCase.java @@ -30,7 +30,7 @@ public abstract class AbstractResourceInstrumentationTestCase extends Instrument protected static void removeCacheCompletely(final String geocode) { final EnumSet<RemoveFlag> flags = EnumSet.copyOf(LoadFlags.REMOVE_ALL); - flags.add(RemoveFlag.REMOVE_OWN_WAYPOINTS_ONLY_FOR_TESTING); + flags.add(RemoveFlag.OWN_WAYPOINTS_ONLY_FOR_TESTING); DataStore.removeCache(geocode, flags); } |