Changed database handling

1 files changed, 37 insertions, 37 deletions

diff --git a/tests/src/cgeo/geocaching/cgDataTest.java b/tests/src/cgeo/geocaching/cgDataTest.java
index b818f05..8892ade 100644
--- a/tests/src/cgeo/geocaching/cgDataTest.java
+++ b/tests/src/cgeo/geocaching/cgDataTest.java
@@ -1,11 +1,12 @@
 package cgeo.geocaching;
 
 import cgeo.geocaching.enumerations.CacheType;
+import cgeo.geocaching.enumerations.LoadFlags;
 
 import android.test.ApplicationTestCase;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
 
 public class cgDataTest extends ApplicationTestCase<cgeoapplication> {
 
@@ -35,56 +36,55 @@ public class cgDataTest extends ApplicationTestCase<cgeoapplication> {
 
         try {
 
-        // create lists
-        listId1 = app.createList("cgData Test");
-        assertTrue(listId1 > StoredList.STANDARD_LIST_ID);
-        listId2 = app.createList("cgDataTest");
-        assertTrue(listId2 > StoredList.STANDARD_LIST_ID);
-        assertTrue(app.getLists().size() >= 2);
+            // create lists
+            listId1 = app.createList("cgData Test");
+            assertTrue(listId1 > StoredList.STANDARD_LIST_ID);
+            listId2 = app.createList("cgDataTest");
+            assertTrue(listId2 > StoredList.STANDARD_LIST_ID);
+            assertTrue(app.getLists().size() >= 2);
 
-        cache1.setDetailed(true);
-        cache1.setListId(listId1);
-        cache2.setDetailed(true);
-        cache2.setListId(listId1);
+            cache1.setDetailed(true);
+            cache1.setListId(listId1);
+            cache2.setDetailed(true);
+            cache2.setListId(listId1);
 
-        // save caches to DB (cache1=listId1, cache2=listId1)
-        SearchResult searchResult = new SearchResult();
-        app.addCacheToSearch(searchResult, cache1);
-        app.addCacheToSearch(searchResult, cache2);
-        assertTrue(app.getAllStoredCachesCount(false, CacheType.ALL, null) >= 2);
+            // save caches to DB (cache1=listId1, cache2=listId1)
+            app.saveCache(cache1, LoadFlags.SAVEALL);
+            app.saveCache(cache2, LoadFlags.SAVEALL);
+            assertTrue(app.getAllStoredCachesCount(false, CacheType.ALL, null) >= 2);
 
-        // rename list (cache1=listId1, cache2=listId1)
-        assertEquals(1, app.renameList(listId1, "cgData Test (renamed)"));
+            // rename list (cache1=listId1, cache2=listId1)
+            assertEquals(1, app.renameList(listId1, "cgData Test (renamed)"));
 
-        // get list
-        StoredList list1 = app.getList(listId1);
-        assertEquals("cgData Test (renamed)", list1.title);
+            // get list
+            StoredList list1 = app.getList(listId1);
+            assertEquals("cgData Test (renamed)", list1.title);
 
-        // move to list (cache1=listId2, cache2=listId2)
-        app.moveToList(cache1.getGeocode(), listId2);
-        assertEquals(1, app.getAllStoredCachesCount(false, CacheType.ALL, listId2));
+            // move to list (cache1=listId2, cache2=listId2)
+            app.moveToList(cache1.getGeocode(), listId2);
+            assertEquals(1, app.getAllStoredCachesCount(false, CacheType.ALL, listId2));
 
-        // remove list (cache1=1, cache2=listId2)
-        assertTrue(app.removeList(listId1));
+            // remove list (cache1=1, cache2=listId2)
+            assertTrue(app.removeList(listId1));
 
-        // mark dropped (cache1=1, cache2=0)
-        assertTrue(app.markDropped(cache2.getGeocode()));
+            // mark dropped (cache1=1, cache2=0)
+            app.markDropped(cache2.getGeocode());
 
-        // mark stored (cache1=1, cache2=listId2)
-        app.markStored(cache2.getGeocode(), listId2);
-        StoredList list2 = app.getList(listId2);
-        // assertEquals(1, list2.count);
+            // mark stored (cache1=1, cache2=listId2)
+            app.markStored(cache2.getGeocode(), listId2);
+            StoredList list2 = app.getList(listId2);
+            //assertEquals(1, list2.count);
 
-        // drop stored (cache1=0, cache2=0)
-        app.dropStored(listId2);
+            // drop stored (cache1=0, cache2=0)
+            app.dropList(listId2);
 
         } finally {
 
             // remove caches
-            List<String> geocodes = new ArrayList<String>();
+            Set<String> geocodes = new HashSet<String>();
             geocodes.add(cache1.getGeocode());
             geocodes.add(cache2.getGeocode());
-            app.dropCaches(geocodes);
+            app.removeCaches(geocodes, LoadFlags.REMOVEALL);
 
             // remove list
             app.removeList(listId1);