refactoring: remove bad compare method of waypoints

1 files changed, 21 insertions, 17 deletions

diff --git a/tests/src/cgeo/geocaching/WaypointTest.java b/tests/src/cgeo/geocaching/WaypointTest.java
index dc2853a..3ddc32c 100644
--- a/tests/src/cgeo/geocaching/WaypointTest.java
+++ b/tests/src/cgeo/geocaching/WaypointTest.java
@@ -14,23 +14,27 @@ public class WaypointTest extends AndroidTestCase {
         final Waypoint own = new Waypoint("own", WaypointType.OWN, true);
         final Waypoint parking = new Waypoint("parking", WaypointType.PARKING, false);
 
-        assertTrue(trailhead.compareTo(puzzle) < 0);
-        assertTrue(trailhead.compareTo(stage) < 0);
-        assertTrue(trailhead.compareTo(cache) < 0);
-
-        assertTrue(stage.compareTo(cache) < 0);
-        assertTrue(puzzle.compareTo(cache) < 0);
-
-        assertTrue(trailhead.compareTo(own) < 0);
-        assertTrue(puzzle.compareTo(own) < 0);
-        assertTrue(stage.compareTo(own) < 0);
-        assertTrue(cache.compareTo(own) < 0);
-
-        assertTrue(parking.compareTo(puzzle) < 0);
-        assertTrue(parking.compareTo(stage) < 0);
-        assertTrue(parking.compareTo(cache) < 0);
-        assertTrue(parking.compareTo(own) < 0);
-        assertTrue(parking.compareTo(trailhead) < 0);
+        assertOrdered(trailhead, puzzle);
+        assertOrdered(trailhead, stage);
+        assertOrdered(trailhead, cache);
+
+        assertOrdered(stage, cache);
+        assertOrdered(puzzle, cache);
+
+        assertOrdered(trailhead, own);
+        assertOrdered(puzzle, own);
+        assertOrdered(stage, own);
+        assertOrdered(cache, own);
+
+        assertOrdered(parking, puzzle);
+        assertOrdered(parking, stage);
+        assertOrdered(parking, cache);
+        assertOrdered(parking, own);
+        assertOrdered(parking, trailhead);
+    }
+
+    private static void assertOrdered(Waypoint first, Waypoint second) {
+        assertTrue(Waypoint.WAYPOINT_COMPARATOR.compare(first, second) < 0);
     }
 
     public static void testGeocode() {