diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/src/cgeo/geocaching/GeocacheTest.java | 21 | ||||
| -rw-r--r-- | tests/src/cgeo/geocaching/cgDataTest.java | 6 |
2 files changed, 9 insertions, 18 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); diff --git a/tests/src/cgeo/geocaching/cgDataTest.java b/tests/src/cgeo/geocaching/cgDataTest.java index e175603..c82053e 100644 --- a/tests/src/cgeo/geocaching/cgDataTest.java +++ b/tests/src/cgeo/geocaching/cgDataTest.java @@ -165,8 +165,7 @@ public class cgDataTest extends CGeoTestCase { main.setCoords(new Geopoint("N49 44.0 E8 37.0")); final Geocache inTileLowZoom = new Geocache(); inTileLowZoom.setGeocode("GC12346"); - inTileLowZoom.setCoords(new Geopoint("N49 44.001 E8 37.001")); - inTileLowZoom.setZoomlevel(Tile.ZOOMLEVEL_MIN_PERSONALIZED - 5); + inTileLowZoom.setCoords(new Geopoint("N49 44.001 E8 37.001"), Tile.ZOOMLEVEL_MIN_PERSONALIZED - 5); final Geocache outTile = new Geocache(); outTile.setGeocode("GC12347"); outTile.setCoords(new Geopoint(tile.getViewport().getLatitudeMin() - 0.1, tile.getViewport().getLongitudeMin() - 0.1)); @@ -175,8 +174,7 @@ public class cgDataTest extends CGeoTestCase { otherConnector.setCoords(new Geopoint("N49 44.0 E8 37.0")); final Geocache inTileHighZoom = new Geocache(); inTileHighZoom.setGeocode("GC12348"); - inTileHighZoom.setCoords(new Geopoint("N49 44.001 E8 37.001")); - inTileHighZoom.setZoomlevel(Tile.ZOOMLEVEL_MIN_PERSONALIZED + 1); + inTileHighZoom.setCoords(new Geopoint("N49 44.001 E8 37.001"), Tile.ZOOMLEVEL_MIN_PERSONALIZED + 1); // put in cache cgData.saveCache(main, EnumSet.of(SaveFlag.SAVE_CACHE)); |