aboutsummaryrefslogtreecommitdiffstats
path: root/tests/src/cgeo/geocaching/geopoint
diff options
context:
space:
mode:
Diffstat (limited to 'tests/src/cgeo/geocaching/geopoint')
-rw-r--r--tests/src/cgeo/geocaching/geopoint/DistanceParserTest.java10
-rw-r--r--tests/src/cgeo/geocaching/geopoint/GeoPointParserTest.java9
2 files changed, 13 insertions, 6 deletions
diff --git a/tests/src/cgeo/geocaching/geopoint/DistanceParserTest.java b/tests/src/cgeo/geocaching/geopoint/DistanceParserTest.java
index 52a1080..a549cf1 100644
--- a/tests/src/cgeo/geocaching/geopoint/DistanceParserTest.java
+++ b/tests/src/cgeo/geocaching/geopoint/DistanceParserTest.java
@@ -6,7 +6,7 @@ import junit.framework.Assert;
public class DistanceParserTest extends AndroidTestCase {
- static private final double MM = 1e-6; // 1mm, in kilometers
+ static private final double MM = 1e-6; // 1mm, in kilometers
public static void testFormats() {
Assert.assertEquals(1.2, DistanceParser.parseDistance("1200 m", true), MM);
@@ -14,19 +14,19 @@ public class DistanceParserTest extends AndroidTestCase {
Assert.assertEquals(0.36576, DistanceParser.parseDistance("1200 ft", true), MM);
Assert.assertEquals(1.09728, DistanceParser.parseDistance("1200 yd", true), MM);
Assert.assertEquals(1.9312128, DistanceParser.parseDistance("1.2 mi", true), MM);
- }
+ }
public static void testImplicit() {
Assert.assertEquals(1.2, DistanceParser.parseDistance("1200", true), MM);
Assert.assertEquals(0.36576, DistanceParser.parseDistance("1200", false), MM);
- }
+ }
public static void testComma() {
Assert.assertEquals(1.2, DistanceParser.parseDistance("1,2km", true), MM);
- }
+ }
public static void testCase() {
Assert.assertEquals(0.36576, DistanceParser.parseDistance("1200 FT", true), MM);
- }
+ }
} \ No newline at end of file
diff --git a/tests/src/cgeo/geocaching/geopoint/GeoPointParserTest.java b/tests/src/cgeo/geocaching/geopoint/GeoPointParserTest.java
index 6b70523..076f2c9 100644
--- a/tests/src/cgeo/geocaching/geopoint/GeoPointParserTest.java
+++ b/tests/src/cgeo/geocaching/geopoint/GeoPointParserTest.java
@@ -1,5 +1,7 @@
package cgeo.geocaching.geopoint;
+import cgeo.geocaching.ui.Formatter;
+
import android.test.AndroidTestCase;
public class GeoPointParserTest extends AndroidTestCase {
@@ -31,7 +33,6 @@ public class GeoPointParserTest extends AndroidTestCase {
assertNull(point);
}
-
public static void testSouth() {
assertEquals(-refLatitude, GeopointParser.parseLatitude("S 49° 56.031"), 1e-8);
}
@@ -50,6 +51,12 @@ public class GeoPointParserTest extends AndroidTestCase {
assertTrue(goal1.isEqualTo(goal2, 1e-6));
}
+ public static void testParseOurOwnSeparator() {
+ final Geopoint separator = GeopointParser.parse("N 49° 43' 57\"" + Formatter.SEPARATOR + "E 2 12' 35");
+ final Geopoint noSeparator = GeopointParser.parse("N 49 43.95 E2°12.5833333333");
+ assertTrue(separator.isEqualTo(noSeparator, 1e-6));
+ }
+
public static void testInSentence() {
final Geopoint p1 = GeopointParser.parse("Station3: N51 21.523 / E07 02.680");
final Geopoint p2 = GeopointParser.parse("N51 21.523", "E07 02.680");