diff options
Diffstat (limited to 'tests/src/cgeo/test/Compare.java')
| -rw-r--r-- | tests/src/cgeo/test/Compare.java | 65 |
1 files changed, 32 insertions, 33 deletions
diff --git a/tests/src/cgeo/test/Compare.java b/tests/src/cgeo/test/Compare.java index 2ce8d49..5e5d5b8 100644 --- a/tests/src/cgeo/test/Compare.java +++ b/tests/src/cgeo/test/Compare.java @@ -1,8 +1,6 @@ package cgeo.test; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNotNull; -import static junit.framework.Assert.assertTrue; +import static org.assertj.core.api.Assertions.assertThat; import cgeo.geocaching.Geocache; import cgeo.geocaching.ICache; @@ -17,42 +15,43 @@ public abstract class Compare { public static void assertCompareCaches(ICache expected, Geocache actual, boolean all) { String geocode = expected.getGeocode(); - assertNotNull("Cache " + geocode + " is missing", actual); - assertEquals("Cache " + geocode + ": geocode wrong", expected.getGeocode(), actual.getGeocode()); - assertTrue("Cache " + geocode + ": type wrong", expected.getType() == actual.getType()); - assertEquals("Cache " + geocode + ": OwnerDisplayName wrong", expected.getOwnerDisplayName(), actual.getOwnerDisplayName()); - assertEquals("Cache " + geocode + ": difficulty wrong", expected.getDifficulty(), actual.getDifficulty()); - assertEquals("Cache " + geocode + ": terrain wrong", expected.getTerrain(), actual.getTerrain()); - assertEquals("Cache " + geocode + ": disabled wrong", expected.isDisabled(), actual.isDisabled()); - assertEquals("Cache " + geocode + ": archived wrong", expected.isArchived(), actual.isArchived()); - assertEquals("Cache " + geocode + ": size wrong", expected.getSize(), actual.getSize()); - assertEquals("Cache " + geocode + ": name wrong", expected.getName(), actual.getName()); - assertEquals("Cache " + geocode + ": guid wrong", expected.getGuid(), actual.getGuid()); - assertTrue("Cache " + geocode + ": fav points wrong", expected.getFavoritePoints() <= actual.getFavoritePoints()); + assertThat(actual).isNotNull(); + assertThat(expected.getGeocode()).as("Cache " + geocode + ": geocode").isEqualTo(actual.getGeocode()); + assertThat(expected.getType()).as("Cache " + geocode + ": type").isEqualTo(actual.getType()); + assertThat(expected.getOwnerDisplayName()).as("Cache " + geocode + ": OwnerDisplayName").isEqualTo(actual.getOwnerDisplayName()); + assertThat(expected.getDifficulty()).as("Cache " + geocode + ": difficulty").isEqualTo(actual.getDifficulty()); + assertThat(expected.getTerrain()).as("Cache " + geocode + ": terrain").isEqualTo(actual.getTerrain()); + assertThat(expected.isDisabled()).as("Cache " + geocode + ": disabled").isEqualTo(actual.isDisabled()); + assertThat(expected.isArchived()).as("Cache " + geocode + ": archived").isEqualTo(actual.isArchived()); + assertThat(actual.getSize()).overridingErrorMessage("Cache " + geocode + ": expected size", expected.getSize()).isEqualTo(expected.getSize()); + assertThat(expected.getName()).as("Cache " + geocode + ": name").isEqualTo(actual.getName()); + assertThat(expected.getGuid()).as("Cache " + geocode + ": guid").isEqualTo(actual.getGuid()); + assertThat(expected.getFavoritePoints()).as("Cache " + geocode + ": fav points").isLessThanOrEqualTo(actual.getFavoritePoints()); final Date hiddenDate = actual.getHiddenDate(); - assertNotNull(hiddenDate); - assertEquals("Cache " + geocode + ": hidden date wrong", expected.getHiddenDate().toString(), hiddenDate.toString()); - assertEquals("Cache " + geocode + ": premium only wrong", expected.isPremiumMembersOnly(), actual.isPremiumMembersOnly()); + assertThat(hiddenDate).isNotNull(); + assert hiddenDate != null; // silence the eclipse compiler in the next line + assertThat(expected.getHiddenDate().toString()).as("Cache " + geocode + ": hidden date").isEqualTo(hiddenDate.toString()); + assertThat(expected.isPremiumMembersOnly()).as("Cache " + geocode + ": premium only").isEqualTo(actual.isPremiumMembersOnly()); if (all) { - assertEquals("Cache " + geocode + ": coords wrong", expected.getCoords(), actual.getCoords()); - assertTrue("Cache " + geocode + ": reliable latlon wrong", actual.isReliableLatLon()); - assertEquals("Cache " + geocode + ": owning status wrong", expected.isOwner(), actual.isOwner()); - assertEquals("Cache " + geocode + ": owner user id wrong", expected.getOwnerUserId(), actual.getOwnerUserId()); - assertTrue("Cache " + geocode + ": hint wrong", StringUtils.equals(expected.getHint(), actual.getHint()) || StringUtils.equals(expected.getHint(), CryptUtils.rot13(actual.getHint()))); - assertTrue("Cache " + geocode + ": description wrong", actual.getDescription().startsWith(expected.getDescription())); - assertEquals("Cache " + geocode + ": short description wrong", expected.getShortDescription(), actual.getShortDescription()); - assertEquals("Cache " + geocode + ": cache id wrong", expected.getCacheId(), actual.getCacheId()); - assertEquals("Cache " + geocode + ": location wrong", expected.getLocation(), actual.getLocation()); - assertEquals("Cache " + geocode + ": found status wrong", expected.isFound(), actual.isFound()); - assertEquals("Cache " + geocode + ": favorite status wrong", expected.isFavorite(), actual.isFavorite()); - assertEquals("Cache " + geocode + ": watchlist status wrong", expected.isOnWatchlist(), actual.isOnWatchlist()); + assertThat(expected.getCoords()).as("Cache " + geocode + ": coords").isEqualTo(actual.getCoords()); + assertThat(actual.isReliableLatLon()).as("Cache " + geocode + ": reliable latlon").isTrue(); + assertThat(expected.isOwner()).as("Cache " + geocode + ": owning status").isEqualTo(actual.isOwner()); + assertThat(expected.getOwnerUserId()).as("Cache " + geocode + ": owner user id").isEqualTo(actual.getOwnerUserId()); + assertThat(StringUtils.equals(expected.getHint(), actual.getHint()) || StringUtils.equals(expected.getHint(), CryptUtils.rot13(actual.getHint()))).isTrue(); + assertThat(actual.getDescription()).as("description").startsWith(expected.getDescription()); + assertThat(expected.getShortDescription()).as("Cache " + geocode + ": short description").isEqualTo(actual.getShortDescription()); + assertThat(expected.getCacheId()).as("Cache " + geocode + ": cache id").isEqualTo(actual.getCacheId()); + assertThat(expected.getLocation()).as("Cache " + geocode + ": location").isEqualTo(actual.getLocation()); + assertThat(expected.isFound()).as("Cache " + geocode + ": found status").isEqualTo(actual.isFound()); + assertThat(expected.isFavorite()).as("Cache " + geocode + ": favorite status").isEqualTo(actual.isFavorite()); + assertThat(expected.isOnWatchlist()).as("Cache " + geocode + ": watchlist status").isEqualTo(actual.isOnWatchlist()); for (String attribute : expected.getAttributes()) { - assertTrue("Expected attribute '" + attribute + "' not found in " + actual.getGeocode(), actual.getAttributes().contains(attribute)); + assertThat(actual.getAttributes()).as("attributes of " + actual.getGeocode()).contains(attribute); } for (LogType logType : expected.getLogCounts().keySet()) { - assertTrue("Cache " + geocode + ": logcount for type " + logType.toString() + " wrong", actual.getLogCounts().get(logType) >= expected.getLogCounts().get(logType)); + assertThat(actual.getLogCounts().get(logType)).as("logcount of " + geocode + " for type " + logType.toString()).isGreaterThanOrEqualTo(expected.getLogCounts().get(logType)); } // The inventories can differ too often, therefore we don't compare them. Also, the personal note @@ -60,7 +59,7 @@ public abstract class Compare { final int actualSpoilersSize = null != actual.getSpoilers() ? actual.getSpoilers().size() : 0; final int expectedSpoilersSize = null != expected.getSpoilers() ? expected.getSpoilers().size() : 0; - assertEquals("Cache " + geocode + ": spoiler count wrong", expectedSpoilersSize, actualSpoilersSize); + assertThat(expectedSpoilersSize).as("Cache " + geocode + ": spoiler count").isEqualTo(actualSpoilersSize); } } |