1 files changed, 24 insertions, 23 deletions

diff --git a/tests/src/cgeo/geocaching/cgDataTest.java b/tests/src/cgeo/geocaching/cgDataTest.java
index 0625585..3ce6431 100644
--- a/tests/src/cgeo/geocaching/cgDataTest.java
+++ b/tests/src/cgeo/geocaching/cgDataTest.java
@@ -1,26 +1,16 @@
 package cgeo.geocaching;
 
+import cgeo.CGeoTestCase;
 import cgeo.geocaching.enumerations.CacheType;
 import cgeo.geocaching.enumerations.LoadFlags;
+import cgeo.geocaching.geopoint.Geopoint;
+import cgeo.geocaching.geopoint.Viewport;
 
-import android.test.ApplicationTestCase;
-
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
-public class cgDataTest extends ApplicationTestCase<cgeoapplication> {
-
-    public cgDataTest() {
-        super(cgeoapplication.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        // init environment
-        createApplication();
-    }
+public class cgDataTest extends CGeoTestCase {
 
     public static void testStoredLists() {
 
@@ -29,9 +19,10 @@ public class cgDataTest extends ApplicationTestCase<cgeoapplication> {
         int listId2 = StoredList.STANDARD_LIST_ID;
 
         // create caches
-        final cgCache cache1 = cgBaseTest.createCache(0);
-        assertNotNull(cache1);
-        final cgCache cache2 = cgBaseTest.createCache(1);
+        final cgCache cache1 = new cgCache();
+        cache1.setGeocode("Cache 1");
+        final cgCache cache2 = new cgCache();
+        cache2.setGeocode("Cache 2");
         assertNotNull(cache2);
 
         try {
@@ -51,7 +42,7 @@ public class cgDataTest extends ApplicationTestCase<cgeoapplication> {
             // save caches to DB (cache1=listId1, cache2=listId1)
             app.saveCache(cache1, LoadFlags.SAVE_ALL);
             app.saveCache(cache2, LoadFlags.SAVE_ALL);
-            assertTrue(app.getAllStoredCachesCount(false, CacheType.ALL, null) >= 2);
+            assertTrue(app.getAllStoredCachesCount(false, CacheType.ALL) >= 2);
 
             // rename list (cache1=listId1, cache2=listId1)
             assertEquals(1, app.renameList(listId1, "cgData Test (renamed)"));
@@ -61,17 +52,17 @@ public class cgDataTest extends ApplicationTestCase<cgeoapplication> {
             assertEquals("cgData Test (renamed)", list1.title);
 
             // move to list (cache1=listId2, cache2=listId2)
-            app.moveToList(cache1.getGeocode(), listId2);
+            app.moveToList(Collections.singletonList(cache1), listId2);
             assertEquals(1, app.getAllStoredCachesCount(false, CacheType.ALL, listId2));
 
             // remove list (cache1=listId2, cache2=listId2)
             assertTrue(app.removeList(listId1));
 
             // mark dropped (cache1=1, cache2=0)
-            app.markDropped(cache2.getGeocode());
+            app.markDropped(Collections.singletonList(cache2));
 
             // mark stored (cache1=1, cache2=listId2)
-            app.markStored(cache2.getGeocode(), listId2);
+            app.markStored(Collections.singletonList(cache2), listId2);
             assertEquals(2, app.getAllStoredCachesCount(false, CacheType.ALL, listId2));
 
             // drop stored (cache1=0, cache2=0)
@@ -90,4 +81,14 @@ public class cgDataTest extends ApplicationTestCase<cgeoapplication> {
             app.removeList(listId2);
         }
     }
-}
\ No newline at end of file
+
+    // Check that queries don't throw an exception (see issue #1429).
+    public static void testLoadWaypoints() {
+        final Viewport viewport = new Viewport(new Geopoint(-1, -2), new Geopoint(3, 4));
+        final cgeoapplication app = cgeoapplication.getInstance();
+        app.getWaypointsInViewport(viewport, false, false);
+        app.getWaypointsInViewport(viewport, false, true);
+        app.getWaypointsInViewport(viewport, true, false);
+        app.getWaypointsInViewport(viewport, true, true);
+    }
+}