1 files changed, 20 insertions, 13 deletions

diff --git a/tests/src/cgeo/geocaching/geopoint/GeopointTest.java b/tests/src/cgeo/geocaching/geopoint/GeopointTest.java
index 894b046..76a9496 100644
--- a/tests/src/cgeo/geocaching/geopoint/GeopointTest.java
+++ b/tests/src/cgeo/geocaching/geopoint/GeopointTest.java
@@ -1,9 +1,10 @@
 package cgeo.geocaching.geopoint;
 
-import cgeo.geocaching.geopoint.Geopoint.DDD;
-import cgeo.geocaching.geopoint.Geopoint.DMM;
-import cgeo.geocaching.geopoint.Geopoint.DMS;
+import cgeo.geocaching.geopoint.direction.DDD;
+import cgeo.geocaching.geopoint.direction.DMM;
+import cgeo.geocaching.geopoint.direction.DMS;
 
+import android.os.Bundle;
 import android.test.AndroidTestCase;
 
 import junit.framework.Assert;
@@ -41,12 +42,6 @@ public class GeopointTest extends AndroidTestCase {
         Assert.assertFalse(gp1.equals(gp2));
     }
 
-    public static void testCreateE6() {
-        final Geopoint gp1 = new Geopoint(48.2, 2.34);
-        final Geopoint gp2 = new Geopoint(48200000, 2340000);
-        Assert.assertTrue(gp1.isEqualTo(gp2, 1e-6));
-    }
-
     public static void testGetE6() {
         final Geopoint gp = new Geopoint(41.2, -3.4);
         Assert.assertEquals(41200000.0, gp.getLatitudeE6(), 1e-6);
@@ -67,6 +62,14 @@ public class GeopointTest extends AndroidTestCase {
         Assert.assertEquals(107.715, gp2.bearingTo(gp1), 1e-3);
     }
 
+    public static void testParcelable() {
+        final Geopoint gp = new Geopoint(1.2, 3.4);
+        final String KEY = "geopoint";
+        final Bundle bundle = new Bundle();
+        bundle.putParcelable(KEY, gp);
+        assertEquals(gp, bundle.getParcelable(KEY));
+    }
+
     public static void testDDD() {
         // case 1
         final Geopoint gp1 = new Geopoint(51.3d, 13.8d);
@@ -77,7 +80,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 +91,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 +140,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 +197,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);
@@ -243,4 +246,8 @@ public class GeopointTest extends AndroidTestCase {
         Assert.assertEquals(lonSecFrac, dms.lonSecFrac);
     }
 
+    public static void testElevation() {
+        assertEquals(125.663703918457, (new Geopoint(48.0, 2.0)).getElevation(), 0.1);
+    }
+
 }