aboutsummaryrefslogtreecommitdiffstats
path: root/tests/src/cgeo/geocaching/GeocacheTest.java
diff options
context:
space:
mode:
authorrsudev <rasch@munin-soft.de>2013-07-28 12:48:32 +0200
committerrsudev <rasch@munin-soft.de>2013-07-28 13:35:22 +0200
commit77e7e33e8956fa00b6e7f43be6c51177f4b6cf5b (patch)
treeced5745ac67430f885909fcfcaa270584fa31749 /tests/src/cgeo/geocaching/GeocacheTest.java
parent8abfdd11cb19ddf6f3d3af5ab761e58a853cc465 (diff)
downloadcgeo-77e7e33e8956fa00b6e7f43be6c51177f4b6cf5b.zip
cgeo-77e7e33e8956fa00b6e7f43be6c51177f4b6cf5b.tar.gz
cgeo-77e7e33e8956fa00b6e7f43be6c51177f4b6cf5b.tar.bz2
Finetuning fixes for #1851 and #3000 (cache merging)
Diffstat (limited to 'tests/src/cgeo/geocaching/GeocacheTest.java')
-rw-r--r--tests/src/cgeo/geocaching/GeocacheTest.java21
1 files changed, 7 insertions, 14 deletions
diff --git a/tests/src/cgeo/geocaching/GeocacheTest.java b/tests/src/cgeo/geocaching/GeocacheTest.java
index aa0a581..4052917 100644
--- a/tests/src/cgeo/geocaching/GeocacheTest.java
+++ b/tests/src/cgeo/geocaching/GeocacheTest.java
@@ -119,8 +119,7 @@ public class GeocacheTest extends AndroidTestCase {
Geocache livemap = new Geocache();
livemap.setGeocode("GC12345");
livemap.setType(CacheType.MULTI);
- livemap.setCoords(new Geopoint(41.0, 9.0));
- livemap.setZoomlevel(12);
+ livemap.setCoords(new Geopoint(41.0, 9.0), 12);
livemap.gatherMissingFrom(stored);
@@ -137,14 +136,12 @@ public class GeocacheTest extends AndroidTestCase {
Geocache livemapFirst = new Geocache();
livemapFirst.setGeocode("GC12345");
livemapFirst.setType(CacheType.TRADITIONAL);
- livemapFirst.setCoords(new Geopoint(40.0, 8.0));
- livemapFirst.setZoomlevel(11);
+ livemapFirst.setCoords(new Geopoint(40.0, 8.0), 11);
Geocache livemapSecond = new Geocache();
livemapSecond.setGeocode("GC12345");
livemapSecond.setType(CacheType.MULTI);
- livemapSecond.setCoords(new Geopoint(41.0, 9.0));
- livemapSecond.setZoomlevel(12);
+ livemapSecond.setCoords(new Geopoint(41.0, 9.0), 12);
livemapSecond.gatherMissingFrom(livemapFirst);
@@ -159,14 +156,12 @@ public class GeocacheTest extends AndroidTestCase {
Geocache livemapFirst = new Geocache();
livemapFirst.setGeocode("GC12345");
livemapFirst.setType(CacheType.TRADITIONAL);
- livemapFirst.setCoords(new Geopoint(40.0, 8.0));
- livemapFirst.setZoomlevel(12);
+ livemapFirst.setCoords(new Geopoint(40.0, 8.0), 12);
Geocache livemapSecond = new Geocache();
livemapSecond.setGeocode("GC12345");
livemapSecond.setType(CacheType.MULTI);
- livemapSecond.setCoords(new Geopoint(41.0, 9.0));
- livemapSecond.setZoomlevel(11);
+ livemapSecond.setCoords(new Geopoint(41.0, 9.0), 11);
livemapSecond.gatherMissingFrom(livemapFirst);
@@ -180,9 +175,8 @@ public class GeocacheTest extends AndroidTestCase {
Geocache livemap = new Geocache();
livemap.setGeocode("GC12345");
- livemap.setCoords(new Geopoint(40.0, 8.0));
+ livemap.setCoords(new Geopoint(40.0, 8.0), 12);
livemap.setFound(true);
- livemap.setZoomlevel(12);
Geocache popup = new Geocache();
popup.setGeocode("GC12345");
@@ -204,8 +198,7 @@ public class GeocacheTest extends AndroidTestCase {
Geocache livemap = new Geocache();
livemap.setGeocode("GC12345");
- livemap.setCoords(new Geopoint(40.0, 8.0));
- livemap.setZoomlevel(12);
+ livemap.setCoords(new Geopoint(40.0, 8.0), 12);
livemap.gatherMissingFrom(bmsearched);