diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2012-04-10 22:53:17 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2012-04-11 14:27:00 +0200 |
| commit | 48cfc74434c22e2d54b32cc659877e648536e818 (patch) | |
| tree | 4d009359dd0158d58ed6429a63ec2cbc5d93052a /tests/src/cgeo/geocaching/files | |
| parent | bcbd5b8c58d40b52ae3243245c9716b95fe41ff3 (diff) | |
| download | cgeo-48cfc74434c22e2d54b32cc659877e648536e818.zip cgeo-48cfc74434c22e2d54b32cc659877e648536e818.tar.gz cgeo-48cfc74434c22e2d54b32cc659877e648536e818.tar.bz2 | |
Waypoint and caches both have coordinates, add ICoordinates interface
Geopoint obviously implements ICoordinates. Also, getLongitude() and
getLatitude() were only used in tests, remove them.
Diffstat (limited to 'tests/src/cgeo/geocaching/files')
| -rw-r--r-- | tests/src/cgeo/geocaching/files/GPXParserTest.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/src/cgeo/geocaching/files/GPXParserTest.java b/tests/src/cgeo/geocaching/files/GPXParserTest.java index 3754af1..3ca8460 100644 --- a/tests/src/cgeo/geocaching/files/GPXParserTest.java +++ b/tests/src/cgeo/geocaching/files/GPXParserTest.java @@ -7,7 +7,6 @@ import cgeo.geocaching.enumerations.CacheSize; import cgeo.geocaching.enumerations.CacheType; import cgeo.geocaching.enumerations.WaypointType; import cgeo.geocaching.geopoint.Geopoint; -import cgeo.geocaching.geopoint.GeopointFormatter; import cgeo.geocaching.test.AbstractResourceInstrumentationTestCase; import cgeo.geocaching.test.R; @@ -117,8 +116,7 @@ public class GPXParserTest extends AbstractResourceInstrumentationTestCase { 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()); + assertEquals(refCoordinates, cache.getCoords()); assertEquals("vptsz", cache.getOwner()); assertEquals(CacheSize.SMALL, cache.getSize()); assertEquals(CacheType.MULTI, cache.getType()); |
