3 files changed, 16 insertions, 15 deletions
diff --git a/tests/src/cgeo/geocaching/network/NetworkTest.java b/tests/src/cgeo/geocaching/network/NetworkTest.java
index 98179cc..93c7cbc 100644
--- a/tests/src/cgeo/geocaching/network/NetworkTest.java
+++ b/tests/src/cgeo/geocaching/network/NetworkTest.java
@@ -1,13 +1,14 @@
 package cgeo.geocaching.network;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import junit.framework.TestCase;
 
 public class NetworkTest extends TestCase {
 
     public static void testRfc3986URLEncode() {
-        assertEquals("*", Network.rfc3986URLEncode("*"));
-        assertEquals("~", Network.rfc3986URLEncode("~"));
-        assertEquals("%20", Network.rfc3986URLEncode(" "));
+        assertThat(Network.rfc3986URLEncode("*")).isEqualTo("*");
+        assertThat(Network.rfc3986URLEncode("~")).isEqualTo("~");
+        assertThat(Network.rfc3986URLEncode(" ")).isEqualTo("%20");
     }
 
 }
diff --git a/tests/src/cgeo/geocaching/network/OAuthTest.java b/tests/src/cgeo/geocaching/network/OAuthTest.java
index 6888cec..5e119e8 100644
--- a/tests/src/cgeo/geocaching/network/OAuthTest.java
+++ b/tests/src/cgeo/geocaching/network/OAuthTest.java
@@ -1,5 +1,7 @@
 package cgeo.geocaching.network;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import org.eclipse.jdt.annotation.NonNull;
 
 import java.util.ArrayList;
@@ -41,13 +43,13 @@ public class OAuthTest extends TestCase {
                 final @NonNull
                 String charAsString = String.valueOf(c);
                 final String encoded = OAuth.percentEncode(charAsString);
-                assertFalse("Character '" + charAsString + "' not encoded", charAsString.equals(encoded));
-                assertTrue(encoded.startsWith("%"));
+                assertThat(charAsString).overridingErrorMessage("Character '" + charAsString + "' not encoded").isNotEqualTo(encoded);
+                assertThat(encoded).startsWith("%");
             }
         }
     }
 
     public static void testAsterisk() {
-        assertFalse("*".equals(OAuth.percentEncode("*")));
+        assertThat("*".equals(OAuth.percentEncode("*"))).isFalse();
     }
 }
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");
     }
 
 }