Use assertj assertions

1 files changed, 44 insertions, 57 deletions

diff --git a/tests/src/cgeo/geocaching/GeocacheTest.java b/tests/src/cgeo/geocaching/GeocacheTest.java
index 954b492..28f6620 100644
--- a/tests/src/cgeo/geocaching/GeocacheTest.java
+++ b/tests/src/cgeo/geocaching/GeocacheTest.java
@@ -66,13 +66,12 @@ public class GeocacheTest extends CGeoTestCase {
     }
 
     private void assertWaypointsParsed(final String note, final int expectedWaypoints) {
-
         recordMapStoreFlags();
 
         try {
             setMapStoreFlags(false, false);
 
-            Geocache cache = new Geocache();
+            final Geocache cache = new Geocache();
             final String geocode = "Test" + System.nanoTime();
             cache.setGeocode(geocode);
             cache.setWaypoints(new ArrayList<Waypoint>(), false);
@@ -95,21 +94,20 @@ public class GeocacheTest extends CGeoTestCase {
     }
 
     public static void testMergeDownloadedStored() {
-
-        Geocache stored = new Geocache();
+        final Geocache stored = new Geocache();
         stored.setGeocode("GC12345");
         stored.setDetailed(true);
         stored.setDisabled(true);
         stored.setType(CacheType.TRADITIONAL);
         stored.setCoords(new Geopoint(40.0, 8.0));
         stored.setDescription("Test1");
-        ArrayList<String> attributes = new ArrayList<String>(1);
+        final ArrayList<String> attributes = new ArrayList<String>(1);
         attributes.add("TestAttribute");
         stored.setAttributes(attributes);
         stored.setShortDescription("Short");
         stored.setHint("Hint");
 
-        Geocache download = new Geocache();
+        final Geocache download = new Geocache();
         download.setGeocode("GC12345");
         download.setDetailed(true);
         download.setDisabled(false);
@@ -121,25 +119,23 @@ public class GeocacheTest extends CGeoTestCase {
 
         assertThat(download.isDetailed()).as("merged detailed").isTrue();
         assertThat(download.isDisabled()).as("merged disabled").isFalse();
-        assertEquals("Type not merged correctly", CacheType.MULTI, download.getType());
-        assertEquals("Longitude not merged correctly", 9.0, download.getCoords().getLongitude(), 0.1);
-        assertEquals("Latitude not merged correctly", 41.0, download.getCoords().getLatitude(), 0.1);
-        assertEquals("Description not merged correctly", "Test2", download.getDescription());
-        assertEquals("ShortDescription not merged correctly", "", download.getShortDescription());
-        assertEquals("Attributes not merged correctly", new ArrayList<String>(0), download.getAttributes());
-        assertEquals("Hint not merged correctly", "", download.getHint());
+        assertThat(download.getType()).as("merged download").isEqualTo(CacheType.MULTI);
+        assertThat(download.getCoords()).as("merged coordinates").isEqualTo(new Geopoint(41.0, 9.0));
+        assertThat(download.getDescription()).as("merged description").isEqualTo("Test2");
+        assertThat(download.getShortDescription()).as("merged short description").isEmpty();
+        assertThat(download.getAttributes()).as("merged attributes").isEmpty();
+        assertThat(download.getHint()).as("merged hint").isEmpty();
     }
 
     public static void testMergeLivemapStored() {
-
-        Geocache stored = new Geocache();
+        final Geocache stored = new Geocache();
         stored.setGeocode("GC12345");
         stored.setDetailed(true);
         stored.setDisabled(true);
         stored.setType(CacheType.TRADITIONAL);
         stored.setCoords(new Geopoint(40.0, 8.0));
 
-        Geocache livemap = new Geocache();
+        final Geocache livemap = new Geocache();
         livemap.setGeocode("GC12345");
         livemap.setType(CacheType.MULTI, 12);
         livemap.setCoords(new Geopoint(41.0, 9.0), 12);
@@ -148,90 +144,81 @@ public class GeocacheTest extends CGeoTestCase {
 
         assertThat(livemap.isDetailed()).as("merged detailed").isTrue();
         assertThat(livemap.isDisabled()).as("merged disabled").isTrue();
-        assertEquals("Type not merged correctly", CacheType.TRADITIONAL, livemap.getType());
-        assertEquals("Longitude not merged correctly", 8.0, livemap.getCoords().getLongitude(), 0.1);
-        assertEquals("Latitude not merged correctly", 40.0, livemap.getCoords().getLatitude(), 0.1);
-        assertEquals("Zoomlevel not merged correctly", stored.getCoordZoomLevel(), livemap.getCoordZoomLevel());
+        assertThat(livemap.getType()).as("merged type").isEqualTo(CacheType.TRADITIONAL);
+        assertThat(livemap.getCoords()).as("merged coordinates").isEqualToComparingFieldByField(new Geopoint(40.0, 8.0));
+        assertThat(livemap.getCoordZoomLevel()).as("merged zoomlevel").isEqualTo(stored.getCoordZoomLevel());
     }
 
     public static void testMergeLivemapZoomin() {
-
-        Geocache livemapFirst = new Geocache();
+        final Geocache livemapFirst = new Geocache();
         livemapFirst.setGeocode("GC12345");
         livemapFirst.setType(CacheType.TRADITIONAL);
         livemapFirst.setCoords(new Geopoint(40.0, 8.0), 11);
 
-        Geocache livemapSecond = new Geocache();
+        final Geocache livemapSecond = new Geocache();
         livemapSecond.setGeocode("GC12345");
         livemapSecond.setType(CacheType.MULTI);
         livemapSecond.setCoords(new Geopoint(41.0, 9.0), 12);
 
         livemapSecond.gatherMissingFrom(livemapFirst);
 
-        assertEquals("Type not merged correctly", CacheType.MULTI, livemapSecond.getType());
-        assertEquals("Longitude not merged correctly", 9.0, livemapSecond.getCoords().getLongitude(), 0.1);
-        assertEquals("Latitude not merged correctly", 41.0, livemapSecond.getCoords().getLatitude(), 0.1);
-        assertEquals("Zoomlevel not merged correctly", 12, livemapSecond.getCoordZoomLevel());
+        assertThat(livemapSecond.getType()).as("merged type").isEqualTo(CacheType.MULTI);
+        assertThat(livemapSecond.getCoords()).as("merged coordinates").isEqualTo(new Geopoint(41.0, 9.0));
+        assertThat(livemapSecond.getCoordZoomLevel()).as("merged zoomlevel").isEqualTo(12);
     }
 
     public static void testMergeLivemapZoomout() {
-
-        Geocache livemapFirst = new Geocache();
+        final Geocache livemapFirst = new Geocache();
         livemapFirst.setGeocode("GC12345");
         livemapFirst.setType(CacheType.TRADITIONAL, 12);
         livemapFirst.setCoords(new Geopoint(40.0, 8.0), 12);
 
-        Geocache livemapSecond = new Geocache();
+        final Geocache livemapSecond = new Geocache();
         livemapSecond.setGeocode("GC12345");
         livemapSecond.setType(CacheType.MULTI, 11);
         livemapSecond.setCoords(new Geopoint(41.0, 9.0), 11);
 
         livemapSecond.gatherMissingFrom(livemapFirst);
 
-        assertEquals("Type not merged correctly", CacheType.TRADITIONAL, livemapSecond.getType());
-        assertEquals("Longitude not merged correctly", 8.0, livemapSecond.getCoords().getLongitude(), 0.1);
-        assertEquals("Latitude not merged correctly", 40.0, livemapSecond.getCoords().getLatitude(), 0.1);
-        assertEquals("Zoomlevel not merged correctly", 12, livemapSecond.getCoordZoomLevel());
+        assertThat(livemapSecond.getType()).as("merged type").isEqualTo(CacheType.TRADITIONAL);
+        assertThat(livemapSecond.getCoords()).as("merged coordinates").isEqualTo(new Geopoint(40.0, 8.0));
+        assertThat(livemapSecond.getCoordZoomLevel()).as("merged zoomlevel").isEqualTo(12);
     }
 
     public static void testMergePopupLivemap() {
-
-        Geocache livemap = new Geocache();
+        final Geocache livemap = new Geocache();
         livemap.setGeocode("GC12345");
         livemap.setCoords(new Geopoint(40.0, 8.0), 12);
         livemap.setFound(true);
 
-        Geocache popup = new Geocache();
+        final Geocache popup = new Geocache();
         popup.setGeocode("GC12345");
         popup.setType(CacheType.MULTI);
 
         popup.gatherMissingFrom(livemap);
 
-        assertEquals("Type not merged correctly", CacheType.MULTI, popup.getType());
-        assertEquals("Longitude not merged correctly", 8.0, popup.getCoords().getLongitude(), 0.1);
-        assertEquals("Latitude not merged correctly", 40.0, popup.getCoords().getLatitude(), 0.1);
-        assertThat(popup.isFound()).overridingErrorMessage("Found not merged correctly").isTrue();
-        assertEquals("Zoomlevel not merged correctly", 12, popup.getCoordZoomLevel());
+        assertThat(popup.getType()).as("merged type").isEqualTo(CacheType.MULTI);
+        assertThat(popup.getCoords()).as("merged coordinates").isEqualTo(new Geopoint(40.0, 8.0));
+        assertThat(popup.isFound()).overridingErrorMessage("merged found").isTrue();
+        assertThat(popup.getCoordZoomLevel()).as("merged zoomlevel").isEqualTo(12);
     }
 
     public static void testMergeLivemapBMSearched() {
-
-        Geocache bmsearched = new Geocache();
+        final Geocache bmsearched = new Geocache();
         bmsearched.setGeocode("GC12345");
 
-        Geocache livemap = new Geocache();
+        final Geocache livemap = new Geocache();
         livemap.setGeocode("GC12345");
         livemap.setCoords(new Geopoint(40.0, 8.0), 12);
 
         livemap.gatherMissingFrom(bmsearched);
 
-        assertEquals("Longitude not merged correctly", 8.0, livemap.getCoords().getLongitude(), 0.1);
-        assertEquals("Latitude not merged correctly", 40.0, livemap.getCoords().getLatitude(), 0.1);
-        assertEquals("Zoomlevel not merged correctly", 12, livemap.getCoordZoomLevel());
+        assertThat(livemap.getCoords()).as("merged coordinates").isEqualTo(new Geopoint(40.0, 8.0));
+        assertThat(livemap.getCoordZoomLevel()).as("merged zoomlevel").isEqualTo(12);
     }
 
     public static void testNameForSorting() {
-        Geocache cache = new Geocache();
+        final Geocache cache = new Geocache();
         cache.setName("GR8 01-01");
         assertThat(cache.getNameForSorting()).isEqualTo("GR000008 000001-000001");
     }
@@ -253,7 +240,7 @@ public class GeocacheTest extends CGeoTestCase {
     }
 
     public static void testGuessEventTimeShortDescription() {
-        Geocache cache = new Geocache();
+        final Geocache cache = new Geocache();
         cache.setType(CacheType.EVENT);
         cache.setDescription(StringUtils.EMPTY);
         cache.setShortDescription("text 14:20 text");
@@ -276,13 +263,13 @@ public class GeocacheTest extends CGeoTestCase {
     }
 
     public static void testGetPossibleLogTypes() throws Exception {
-        Geocache gcCache = new Geocache();
+        final Geocache gcCache = new Geocache();
         gcCache.setGeocode("GC123");
         gcCache.setType(CacheType.WEBCAM);
         assertThat(gcCache.getPossibleLogTypes()).as("possible GC cache log types").contains(LogType.WEBCAM_PHOTO_TAKEN);
         assertThat(gcCache.getPossibleLogTypes()).as("possible GC cache log types").contains(LogType.NEEDS_MAINTENANCE);
 
-        Geocache ocCache = new Geocache();
+        final Geocache ocCache = new Geocache();
         ocCache.setGeocode("OC1234");
         ocCache.setType(CacheType.TRADITIONAL);
         assertThat(ocCache.getPossibleLogTypes()).as("traditional cache possible log types").doesNotContain(LogType.WEBCAM_PHOTO_TAKEN);
@@ -290,24 +277,24 @@ public class GeocacheTest extends CGeoTestCase {
     }
 
     public static void testLogTypeEventPast() throws Exception {
-        Calendar today = Calendar.getInstance();
+        final Calendar today = Calendar.getInstance();
         today.add(Calendar.DAY_OF_MONTH, -1);
         assertThat(createEventCache(today).getDefaultLogType()).isEqualTo(LogType.ATTENDED);
     }
 
     public static void testLogTypeEventToday() throws Exception {
-        Calendar today = Calendar.getInstance();
+        final Calendar today = Calendar.getInstance();
         assertThat(createEventCache(today).getDefaultLogType()).isEqualTo(LogType.ATTENDED);
     }
 
     public static void testLogTypeEventFuture() throws Exception {
-        Calendar today = Calendar.getInstance();
+        final Calendar today = Calendar.getInstance();
         today.add(Calendar.DAY_OF_MONTH, 1);
         assertThat(createEventCache(today).getDefaultLogType()).isEqualTo(LogType.WILL_ATTEND);
     }
 
-    private static Geocache createEventCache(Calendar calendar) {
-        Geocache cache = new Geocache();
+    private static Geocache createEventCache(final Calendar calendar) {
+        final Geocache cache = new Geocache();
         cache.setType(CacheType.EVENT);
         cache.setHidden(calendar.getTime());
         return cache;