1 files changed, 7 insertions, 9 deletions

diff --git a/tests/src/cgeo/geocaching/network/ParametersTest.java b/tests/src/cgeo/geocaching/network/ParametersTest.java
index 4c56f05..8fff1f7 100644
--- a/tests/src/cgeo/geocaching/network/ParametersTest.java
+++ b/tests/src/cgeo/geocaching/network/ParametersTest.java
@@ -1,27 +1,25 @@
 package cgeo.geocaching.network;
 
-import cgeo.geocaching.network.Parameters;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import android.test.AndroidTestCase;
 
 import java.security.InvalidParameterException;
 
-import junit.framework.Assert;
-
 public class ParametersTest extends AndroidTestCase {
 
     public static void testException() {
         try {
             final Parameters params = new Parameters("aaa", "AAA", "bbb");
             params.clear(); // this will never be invoked, but suppresses warnings about unused objects
-            Assert.fail("Exception not raised");
+            fail("Exception not raised");
         } catch (InvalidParameterException e) {
             // Ok
         }
         try {
             final Parameters params = new Parameters("aaa", "AAA");
             params.put("bbb", "BBB", "ccc");
-            Assert.fail("Exception not raised");
+            fail("Exception not raised");
         } catch (InvalidParameterException e) {
             // Ok
         }
@@ -30,7 +28,7 @@ public class ParametersTest extends AndroidTestCase {
     public static void testMultipleValues() {
         final Parameters params = new Parameters("aaa", "AAA", "bbb", "BBB");
         params.put("ccc", "CCC", "ddd", "DDD");
-        Assert.assertEquals("aaa=AAA&bbb=BBB&ccc=CCC&ddd=DDD", params.toString());
+        assertThat(params.toString()).isEqualTo("aaa=AAA&bbb=BBB&ccc=CCC&ddd=DDD");
     }
 
     public static void testSort() {
@@ -38,16 +36,16 @@ public class ParametersTest extends AndroidTestCase {
         params.put("aaa", "AAA");
         params.put("ccc", "CCC");
         params.put("bbb", "BBB");
-        Assert.assertEquals("aaa=AAA&ccc=CCC&bbb=BBB", params.toString());
+        assertThat(params.toString()).isEqualTo("aaa=AAA&ccc=CCC&bbb=BBB");
         params.sort();
-        Assert.assertEquals("aaa=AAA&bbb=BBB&ccc=CCC", params.toString());
+        assertThat(params.toString()).isEqualTo("aaa=AAA&bbb=BBB&ccc=CCC");
     }
 
     public static void testToString() {
         final Parameters params = new Parameters();
         params.put("name", "foo&bar");
         params.put("type", "moving");
-        Assert.assertEquals("name=foo%26bar&type=moving", params.toString());
+        assertThat(params.toString()).isEqualTo("name=foo%26bar&type=moving");
     }
 
 }