1 files changed, 15 insertions, 13 deletions

diff --git a/tests/src/cgeo/geocaching/enumerations/CacheSizeTest.java b/tests/src/cgeo/geocaching/enumerations/CacheSizeTest.java
index 26a1953..6e02b85 100644
--- a/tests/src/cgeo/geocaching/enumerations/CacheSizeTest.java
+++ b/tests/src/cgeo/geocaching/enumerations/CacheSizeTest.java
@@ -1,5 +1,7 @@
 package cgeo.geocaching.enumerations;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import android.test.AndroidTestCase;
 
 import java.util.Locale;
@@ -7,29 +9,29 @@ import java.util.Locale;
 public class CacheSizeTest extends AndroidTestCase {
 
     public static void testOrder() {
-        assertTrue(CacheSize.MICRO.comparable < CacheSize.SMALL.comparable);
-        assertTrue(CacheSize.SMALL.comparable < CacheSize.REGULAR.comparable);
-        assertTrue(CacheSize.REGULAR.comparable < CacheSize.LARGE.comparable);
+        assertThat(CacheSize.MICRO.comparable < CacheSize.SMALL.comparable).isTrue();
+        assertThat(CacheSize.SMALL.comparable < CacheSize.REGULAR.comparable).isTrue();
+        assertThat(CacheSize.REGULAR.comparable < CacheSize.LARGE.comparable).isTrue();
     }
 
     public static void testGetById() {
-        assertEquals(CacheSize.UNKNOWN, CacheSize.getById(""));
-        assertEquals(CacheSize.UNKNOWN, CacheSize.getById(null));
-        assertEquals(CacheSize.UNKNOWN, CacheSize.getById("random garbage"));
-        assertEquals(CacheSize.LARGE, CacheSize.getById("large"));
-        assertEquals(CacheSize.LARGE, CacheSize.getById("LARGE"));
+        assertThat(CacheSize.getById("")).isEqualTo(CacheSize.UNKNOWN);
+        assertThat(CacheSize.getById(null)).isEqualTo(CacheSize.UNKNOWN);
+        assertThat(CacheSize.getById("random garbage")).isEqualTo(CacheSize.UNKNOWN);
+        assertThat(CacheSize.getById("large")).isEqualTo(CacheSize.LARGE);
+        assertThat(CacheSize.getById("LARGE")).isEqualTo(CacheSize.LARGE);
     }
 
     public static void testGetByIdComplete() {
         for (CacheSize size : CacheSize.values()) {
-            assertEquals(size, CacheSize.getById(size.id));
-            assertEquals(size, CacheSize.getById(size.id.toLowerCase(Locale.US)));
-            assertEquals(size, CacheSize.getById(size.id.toUpperCase(Locale.US)));
+            assertThat(CacheSize.getById(size.id)).isEqualTo(size);
+            assertThat(CacheSize.getById(size.id.toLowerCase(Locale.US))).isEqualTo(size);
+            assertThat(CacheSize.getById(size.id.toUpperCase(Locale.US))).isEqualTo(size);
         }
     }
 
     public static void testGetByIdNumeric() {
-        assertEquals(CacheSize.REGULAR, CacheSize.getById("3"));
-        assertEquals(CacheSize.UNKNOWN, CacheSize.getById("-1"));
+        assertThat(CacheSize.getById("3")).isEqualTo(CacheSize.REGULAR);
+        assertThat(CacheSize.getById("-1")).isEqualTo(CacheSize.UNKNOWN);
     }
 }