aboutsummaryrefslogtreecommitdiffstats
path: root/tests/src/cgeo/geocaching/geopoint
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2012-04-11 09:59:41 +0200
committerSamuel Tardieu <sam@rfc1149.net>2012-04-11 15:45:32 +0200
commit138fb60259388ffe469e435a70f79e8676b96e05 (patch)
tree626530910734bd51e4bc0444131fbc1c26099128 /tests/src/cgeo/geocaching/geopoint
parent48cfc74434c22e2d54b32cc659877e648536e818 (diff)
downloadcgeo-138fb60259388ffe469e435a70f79e8676b96e05.zip
cgeo-138fb60259388ffe469e435a70f79e8676b96e05.tar.gz
cgeo-138fb60259388ffe469e435a70f79e8676b96e05.tar.bz2
Implement equals() and hashCode() for Geopoint
Diffstat (limited to 'tests/src/cgeo/geocaching/geopoint')
-rw-r--r--tests/src/cgeo/geocaching/geopoint/GeoPointParserTest.java4
-rw-r--r--tests/src/cgeo/geocaching/geopoint/GeopointTest.java8
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/src/cgeo/geocaching/geopoint/GeoPointParserTest.java b/tests/src/cgeo/geocaching/geopoint/GeoPointParserTest.java
index 661623e..4e24e5a 100644
--- a/tests/src/cgeo/geocaching/geopoint/GeoPointParserTest.java
+++ b/tests/src/cgeo/geocaching/geopoint/GeoPointParserTest.java
@@ -57,7 +57,7 @@ public class GeoPointParserTest extends AndroidTestCase {
final Geopoint p2 = GeopointParser.parse("N51 21.523", "E07 02.680");
assertNotNull(p1);
assertNotNull(p2);
- assertTrue(p1.isEqualTo(p2));
+ assertTrue(p1.equals(p2));
}
public static void testUnrelatedParts() {
@@ -77,6 +77,6 @@ public class GeoPointParserTest extends AndroidTestCase {
"E 15° 53' 41.68''");
assertNotNull(pointComma);
assertNotNull(pointDot);
- assertTrue(pointComma.isEqualTo(pointDot));
+ assertTrue(pointComma.equals(pointDot));
}
}
diff --git a/tests/src/cgeo/geocaching/geopoint/GeopointTest.java b/tests/src/cgeo/geocaching/geopoint/GeopointTest.java
index 894b046..ba88992 100644
--- a/tests/src/cgeo/geocaching/geopoint/GeopointTest.java
+++ b/tests/src/cgeo/geocaching/geopoint/GeopointTest.java
@@ -77,7 +77,7 @@ public class GeopointTest extends AndroidTestCase {
Geopoint gp1a = DDD.createGeopoint(String.valueOf(ddd1.latDir), String.valueOf(ddd1.latDeg), String.valueOf(ddd1.latDegFrac),
String.valueOf(ddd1.lonDir), String.valueOf(ddd1.lonDeg), String.valueOf(ddd1.lonDegFrac));
- Assert.assertTrue(gp1a.isEqualTo(gp1));
+ Assert.assertTrue(gp1a.equals(gp1));
// case 2
final Geopoint gp2 = new Geopoint(51.34567d, 13.87654d);
@@ -88,7 +88,7 @@ public class GeopointTest extends AndroidTestCase {
Geopoint gp2a = DDD.createGeopoint(String.valueOf(ddd2.latDir), String.valueOf(ddd2.latDeg), String.valueOf(ddd2.latDegFrac),
String.valueOf(ddd2.lonDir), String.valueOf(ddd2.lonDeg), String.valueOf(ddd2.lonDegFrac));
- Assert.assertTrue(gp2a.isEqualTo(gp2));
+ Assert.assertTrue(gp2a.equals(gp2));
// case 3
final Geopoint gp3 = new Geopoint(51.29999833333333d, 13.8d);
@@ -137,7 +137,7 @@ public class GeopointTest extends AndroidTestCase {
Geopoint gp1a = DMM.createGeopoint(String.valueOf(dmm1.latDir), String.valueOf(dmm1.latDeg), String.valueOf(dmm1.latMin), String.valueOf(dmm1.latMinFrac),
String.valueOf(dmm1.lonDir), String.valueOf(dmm1.lonDeg), String.valueOf(dmm1.lonMin), String.valueOf(dmm1.lonMinFrac));
- Assert.assertTrue(gp1a.isEqualTo(gp1));
+ Assert.assertTrue(gp1a.equals(gp1));
// case 2
final Geopoint gp2 = new Geopoint(51.34567d, 13.87654d);
@@ -194,7 +194,7 @@ public class GeopointTest extends AndroidTestCase {
Geopoint gp1a = DMS.createGeopoint(String.valueOf(dms1.latDir), String.valueOf(dms1.latDeg), String.valueOf(dms1.latMin), String.valueOf(dms1.latSec), String.valueOf(dms1.latSecFrac),
String.valueOf(dms1.lonDir), String.valueOf(dms1.lonDeg), String.valueOf(dms1.lonMin), String.valueOf(dms1.lonSec), String.valueOf(dms1.lonSecFrac));
- Assert.assertTrue(gp1a.isEqualTo(gp1));
+ Assert.assertTrue(gp1a.equals(gp1));
// case 2
final Geopoint gp2 = new Geopoint(51.34567d, 13.87654d);