diff options
Diffstat (limited to 'tests/src')
5 files changed, 14 insertions, 14 deletions
diff --git a/tests/src/cgeo/geocaching/files/GPXParserTest.java b/tests/src/cgeo/geocaching/files/GPXParserTest.java index 577c516..7b1264f 100644 --- a/tests/src/cgeo/geocaching/files/GPXParserTest.java +++ b/tests/src/cgeo/geocaching/files/GPXParserTest.java @@ -39,8 +39,8 @@ public class GPXParserTest extends AbstractResourceInstrumentationTestCase { assertEquals("Die Schatzinsel / treasure island", cache.getName()); assertEquals("Die unbesiegbaren Geo - Geparden", cache.getOwner()); assertEquals(CacheSize.MICRO, cache.getSize()); - assertEquals(1.0f, cache.getDifficulty().floatValue()); - assertEquals(5.0f, cache.getTerrain().floatValue()); + assertEquals(1.0f, cache.getDifficulty()); + assertEquals(5.0f, cache.getTerrain()); assertEquals("Baden-Württemberg, Germany", cache.getLocation()); assertEquals("Ein alter Kindheitstraum, ein Schatz auf einer unbewohnten Insel.\nA old dream of my childhood, a treasure on a lonely island.", cache.getShortdesc()); assertTrue(new Geopoint(48.859683, 9.1874).isEqualTo(cache.getCoords())); @@ -63,8 +63,8 @@ public class GPXParserTest extends AbstractResourceInstrumentationTestCase { assertEquals("Die Schatzinsel / treasure island", cache.getName()); assertEquals("Die unbesiegbaren Geo - Geparden", cache.getOwner()); assertEquals(CacheSize.SMALL, cache.getSize()); - assertEquals(1.0f, cache.getDifficulty().floatValue()); - assertEquals(4.0f, cache.getTerrain().floatValue()); + assertEquals(1.0f, cache.getDifficulty()); + assertEquals(4.0f, cache.getTerrain()); assertEquals("Baden-Württemberg, Germany", cache.getLocation()); assertEquals("Ein alter Kindheitstraum, ein Schatz auf einer unbewohnten Insel. A old dream of my childhood, a treasure on a lonely is", cache.getShortdesc()); assertTrue(new Geopoint(48.85968, 9.18740).isEqualTo(cache.getCoords())); @@ -112,8 +112,8 @@ public class GPXParserTest extends AbstractResourceInstrumentationTestCase { assertTrue("Hockenheimer City-Brunnen by vptsz, Multi-cache (2/1)", cache.getShortDescription().startsWith("Kurzer informativer Multi entlang der Brunnen")); assertTrue(cache.getDescription().startsWith("Cachemobile können kostenfrei am Messplatz geparkt werden.")); assertTrue(cache.hasTrackables()); - assertEquals(2.0f, cache.getDifficulty().floatValue(), 0.01f); - assertEquals(1.0f, cache.getTerrain().floatValue(), 0.01f); + assertEquals(2.0f, cache.getDifficulty(), 0.01f); + assertEquals(1.0f, cache.getTerrain(), 0.01f); final Geopoint refCoordinates = new Geopoint("N 49° 19.122", "E 008° 32.739"); assertEquals(refCoordinates.format(GeopointFormatter.Format.LAT_DECMINUTE), cache.getLatitude()); assertEquals(refCoordinates.format(GeopointFormatter.Format.LON_DECMINUTE), cache.getLongitude()); diff --git a/tests/src/cgeo/geocaching/files/LocParserTest.java b/tests/src/cgeo/geocaching/files/LocParserTest.java index 8facfe4..64ac7ad 100644 --- a/tests/src/cgeo/geocaching/files/LocParserTest.java +++ b/tests/src/cgeo/geocaching/files/LocParserTest.java @@ -48,8 +48,8 @@ public class LocParserTest extends AbstractResourceInstrumentationTestCase { assertEquals("GC1BKP3", cache.getGeocode()); assertEquals("Die Schatzinsel / treasure island", cache.getName()); assertTrue(new Geopoint(48.859683, 9.1874).isEqualTo(cache.getCoords())); - assertEquals(1.0f, cache.getDifficulty().floatValue()); - assertEquals(5.0f, cache.getTerrain().floatValue()); + assertEquals(1.0f, cache.getDifficulty()); + assertEquals(5.0f, cache.getTerrain()); assertEquals(CacheSize.MICRO, cache.getSize()); } } diff --git a/tests/src/cgeo/geocaching/test/mock/GC1ZXX2.java b/tests/src/cgeo/geocaching/test/mock/GC1ZXX2.java index deeeb44..e3ad602 100644 --- a/tests/src/cgeo/geocaching/test/mock/GC1ZXX2.java +++ b/tests/src/cgeo/geocaching/test/mock/GC1ZXX2.java @@ -25,7 +25,7 @@ public class GC1ZXX2 extends MockedCache { } @Override - public Float getDifficulty() { + public float getDifficulty() { return 3.0f; } @@ -45,7 +45,7 @@ public class GC1ZXX2 extends MockedCache { } @Override - public Float getTerrain() { + public float getTerrain() { return 1.5f; } diff --git a/tests/src/cgeo/geocaching/test/mock/GC2CJPF.java b/tests/src/cgeo/geocaching/test/mock/GC2CJPF.java index db7270d..216a6f0 100644 --- a/tests/src/cgeo/geocaching/test/mock/GC2CJPF.java +++ b/tests/src/cgeo/geocaching/test/mock/GC2CJPF.java @@ -25,7 +25,7 @@ public class GC2CJPF extends MockedCache { } @Override - public Float getDifficulty() { + public float getDifficulty() { return 2.5f; } @@ -49,7 +49,7 @@ public class GC2CJPF extends MockedCache { } @Override - public Float getTerrain() { + public float getTerrain() { return 2.0f; } diff --git a/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java b/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java index 8b4a1bb..720535b 100644 --- a/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java +++ b/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java @@ -27,12 +27,12 @@ public class GC2JVEH extends MockedCache { } @Override - public Float getDifficulty() { + public float getDifficulty() { return 5.0f; } @Override - public Float getTerrain() { + public float getTerrain() { return 3.0f; } |