diff options
| author | Michael Keppler <michael.keppler@gmx.de> | 2014-04-22 17:30:51 +0200 |
|---|---|---|
| committer | Michael Keppler <michael.keppler@gmx.de> | 2014-04-22 21:44:00 +0200 |
| commit | cc9aa8b1d2b9ec24f2c41e4a523c69edcf8c8ac0 (patch) | |
| tree | fca2712f72bb2759ef4e39c0235a8a5054f27013 /tests/src/cgeo/geocaching/ParametersTest.java | |
| parent | 825b779844b280ba7c1effdd4185cc856eccdf5b (diff) | |
| download | cgeo-cc9aa8b1d2b9ec24f2c41e4a523c69edcf8c8ac0.zip cgeo-cc9aa8b1d2b9ec24f2c41e4a523c69edcf8c8ac0.tar.gz cgeo-cc9aa8b1d2b9ec24f2c41e4a523c69edcf8c8ac0.tar.bz2 | |
#2414 convert junit statements to assertj
This conversion is not complete, but the remaining statements are hard
to catch with regular expressions automatically.
Diffstat (limited to 'tests/src/cgeo/geocaching/ParametersTest.java')
| -rw-r--r-- | tests/src/cgeo/geocaching/ParametersTest.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/src/cgeo/geocaching/ParametersTest.java b/tests/src/cgeo/geocaching/ParametersTest.java index f1d2638..75c045c 100644 --- a/tests/src/cgeo/geocaching/ParametersTest.java +++ b/tests/src/cgeo/geocaching/ParametersTest.java @@ -1,27 +1,27 @@ package cgeo.geocaching; +import static org.assertj.core.api.Assertions.assertThat; + import cgeo.geocaching.network.Parameters; 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 +30,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 +38,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"); } } |
