diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2013-01-23 10:05:03 +0100 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2013-01-23 10:05:03 +0100 |
| commit | d8388f67807681cf0951f8efbd8b6c7d86b87866 (patch) | |
| tree | 1e01e71519eed7c7b0eff71e0a4091b63a811575 /tests/src/cgeo/geocaching/files | |
| parent | c4d3b139bc71dc4cd713a85139ea4364c733d711 (diff) | |
| parent | 2253e295e5a6fc1fb40c5dfaed1ce8e00c1e8088 (diff) | |
| download | cgeo-d8388f67807681cf0951f8efbd8b6c7d86b87866.zip cgeo-d8388f67807681cf0951f8efbd8b6c7d86b87866.tar.gz cgeo-d8388f67807681cf0951f8efbd8b6c7d86b87866.tar.bz2 | |
Merge branch 'release' into upstream
Conflicts:
tests/src/cgeo/geocaching/files/GPXParserTest.java
Diffstat (limited to 'tests/src/cgeo/geocaching/files')
| -rw-r--r-- | tests/src/cgeo/geocaching/files/GPXParserTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/src/cgeo/geocaching/files/GPXParserTest.java b/tests/src/cgeo/geocaching/files/GPXParserTest.java index bbb4514..db29813 100644 --- a/tests/src/cgeo/geocaching/files/GPXParserTest.java +++ b/tests/src/cgeo/geocaching/files/GPXParserTest.java @@ -167,7 +167,7 @@ public class GPXParserTest extends AbstractResourceInstrumentationTestCase { private static void assertGc31j2hWaypoints(final cgCache cache) { assertNotNull(cache.getWaypoints()); assertEquals(2, cache.getWaypoints().size()); - Waypoint wp = cache.getWaypoints().get(1); + Waypoint wp = cache.getWaypoints().get(0); assertEquals("GC31J2H", wp.getGeocode()); assertEquals("00", wp.getPrefix()); assertEquals("---", wp.getLookup()); @@ -177,7 +177,7 @@ public class GPXParserTest extends AbstractResourceInstrumentationTestCase { assertEquals(49.317517, wp.getCoords().getLatitude(), 0.000001); assertEquals(8.545083, wp.getCoords().getLongitude(), 0.000001); - wp = cache.getWaypoints().get(0); + wp = cache.getWaypoints().get(1); assertEquals("GC31J2H", wp.getGeocode()); assertEquals("S1", wp.getPrefix()); assertEquals("---", wp.getLookup()); |