From f829ac6ffb9cb3a98f84a42314854f9df1423ff2 Mon Sep 17 00:00:00 2001 From: jwilson Date: Mon, 1 Jun 2015 21:04:34 -0400 Subject: [PATCH] Use AssertJ instead of JUnit assertions. --- .../squareup/moshi/JsonReaderPathTest.java | 136 ++--- .../com/squareup/moshi/JsonReaderTest.java | 463 +++++++++--------- .../com/squareup/moshi/JsonWriterTest.java | 57 +-- .../squareup/moshi/LinkedHashTreeMapTest.java | 72 ++- .../java/com/squareup/moshi/MoshiTest.java | 53 +- .../java/com/squareup/moshi/TypesTest.java | 3 +- 6 files changed, 384 insertions(+), 400 deletions(-) diff --git a/moshi/src/test/java/com/squareup/moshi/JsonReaderPathTest.java b/moshi/src/test/java/com/squareup/moshi/JsonReaderPathTest.java index 2d1aca6..47c4e36 100644 --- a/moshi/src/test/java/com/squareup/moshi/JsonReaderPathTest.java +++ b/moshi/src/test/java/com/squareup/moshi/JsonReaderPathTest.java @@ -19,156 +19,156 @@ import java.io.IOException; import org.junit.Test; import static com.squareup.moshi.TestUtil.newReader; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; public final class JsonReaderPathTest { @Test public void path() throws IOException { JsonReader reader = newReader("{\"a\":[2,true,false,null,\"b\",{\"c\":\"d\"},[3]]}"); - assertEquals("$", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$"); reader.beginObject(); - assertEquals("$.", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$."); reader.nextName(); - assertEquals("$.a", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$.a"); reader.beginArray(); - assertEquals("$.a[0]", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$.a[0]"); reader.nextInt(); - assertEquals("$.a[1]", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$.a[1]"); reader.nextBoolean(); - assertEquals("$.a[2]", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$.a[2]"); reader.nextBoolean(); - assertEquals("$.a[3]", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$.a[3]"); reader.nextNull(); - assertEquals("$.a[4]", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$.a[4]"); reader.nextString(); - assertEquals("$.a[5]", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$.a[5]"); reader.beginObject(); - assertEquals("$.a[5].", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$.a[5]."); reader.nextName(); - assertEquals("$.a[5].c", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$.a[5].c"); reader.nextString(); - assertEquals("$.a[5].c", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$.a[5].c"); reader.endObject(); - assertEquals("$.a[6]", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$.a[6]"); reader.beginArray(); - assertEquals("$.a[6][0]", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$.a[6][0]"); reader.nextInt(); - assertEquals("$.a[6][1]", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$.a[6][1]"); reader.endArray(); - assertEquals("$.a[7]", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$.a[7]"); reader.endArray(); - assertEquals("$.a", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$.a"); reader.endObject(); - assertEquals("$", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$"); } @Test public void arrayOfObjects() throws IOException { JsonReader reader = newReader("[{},{},{}]"); reader.beginArray(); - assertEquals("$[0]", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$[0]"); reader.beginObject(); - assertEquals("$[0].", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$[0]."); reader.endObject(); - assertEquals("$[1]", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$[1]"); reader.beginObject(); - assertEquals("$[1].", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$[1]."); reader.endObject(); - assertEquals("$[2]", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$[2]"); reader.beginObject(); - assertEquals("$[2].", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$[2]."); reader.endObject(); - assertEquals("$[3]", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$[3]"); reader.endArray(); - assertEquals("$", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$"); } @Test public void arrayOfArrays() throws IOException { JsonReader reader = newReader("[[],[],[]]"); reader.beginArray(); - assertEquals("$[0]", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$[0]"); reader.beginArray(); - assertEquals("$[0][0]", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$[0][0]"); reader.endArray(); - assertEquals("$[1]", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$[1]"); reader.beginArray(); - assertEquals("$[1][0]", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$[1][0]"); reader.endArray(); - assertEquals("$[2]", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$[2]"); reader.beginArray(); - assertEquals("$[2][0]", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$[2][0]"); reader.endArray(); - assertEquals("$[3]", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$[3]"); reader.endArray(); - assertEquals("$", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$"); } @Test public void objectPath() throws IOException { JsonReader reader = newReader("{\"a\":1,\"b\":2}"); - assertEquals("$", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$"); reader.peek(); - assertEquals("$", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$"); reader.beginObject(); - assertEquals("$.", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$."); reader.peek(); - assertEquals("$.", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$."); reader.nextName(); - assertEquals("$.a", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$.a"); reader.peek(); - assertEquals("$.a", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$.a"); reader.nextInt(); - assertEquals("$.a", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$.a"); reader.peek(); - assertEquals("$.a", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$.a"); reader.nextName(); - assertEquals("$.b", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$.b"); reader.peek(); - assertEquals("$.b", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$.b"); reader.nextInt(); - assertEquals("$.b", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$.b"); reader.peek(); - assertEquals("$.b", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$.b"); reader.endObject(); - assertEquals("$", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$"); reader.peek(); - assertEquals("$", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$"); reader.close(); - assertEquals("$", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$"); } @Test public void arrayPath() throws IOException { JsonReader reader = newReader("[1,2]"); - assertEquals("$", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$"); reader.peek(); - assertEquals("$", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$"); reader.beginArray(); - assertEquals("$[0]", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$[0]"); reader.peek(); - assertEquals("$[0]", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$[0]"); reader.nextInt(); - assertEquals("$[1]", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$[1]"); reader.peek(); - assertEquals("$[1]", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$[1]"); reader.nextInt(); - assertEquals("$[2]", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$[2]"); reader.peek(); - assertEquals("$[2]", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$[2]"); reader.endArray(); - assertEquals("$", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$"); reader.peek(); - assertEquals("$", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$"); reader.close(); - assertEquals("$", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$"); } @Test public void multipleTopLevelValuesInOneDocument() throws IOException { @@ -176,10 +176,10 @@ public final class JsonReaderPathTest { reader.setLenient(true); reader.beginArray(); reader.endArray(); - assertEquals("$", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$"); reader.beginArray(); reader.endArray(); - assertEquals("$", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$"); } @Test public void skipArrayElements() throws IOException { @@ -187,14 +187,14 @@ public final class JsonReaderPathTest { reader.beginArray(); reader.skipValue(); reader.skipValue(); - assertEquals("$[2]", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$[2]"); } @Test public void skipObjectNames() throws IOException { JsonReader reader = newReader("{\"a\":1}"); reader.beginObject(); reader.skipValue(); - assertEquals("$.null", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$.null"); } @Test public void skipObjectValues() throws IOException { @@ -202,15 +202,15 @@ public final class JsonReaderPathTest { reader.beginObject(); reader.nextName(); reader.skipValue(); - assertEquals("$.null", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$.null"); reader.nextName(); - assertEquals("$.b", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$.b"); } @Test public void skipNestedStructures() throws IOException { JsonReader reader = newReader("[[1,2,3],4]"); reader.beginArray(); reader.skipValue(); - assertEquals("$[1]", reader.getPath()); + assertThat(reader.getPath()).isEqualTo("$[1]"); } } diff --git a/moshi/src/test/java/com/squareup/moshi/JsonReaderTest.java b/moshi/src/test/java/com/squareup/moshi/JsonReaderTest.java index af992fc..bff9a4c 100644 --- a/moshi/src/test/java/com/squareup/moshi/JsonReaderTest.java +++ b/moshi/src/test/java/com/squareup/moshi/JsonReaderTest.java @@ -19,6 +19,7 @@ import java.io.EOFException; import java.io.IOException; import java.util.Arrays; import okio.Buffer; +import org.assertj.core.data.Offset; import org.junit.Ignore; import org.junit.Test; @@ -33,9 +34,6 @@ import static com.squareup.moshi.JsonReader.Token.NUMBER; import static com.squareup.moshi.JsonReader.Token.STRING; import static com.squareup.moshi.TestUtil.newReader; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; public final class JsonReaderTest { @@ -45,113 +43,113 @@ public final class JsonReaderTest { JsonReader reader1 = new JsonReader(buffer); reader1.beginObject(); reader1.endObject(); - assertEquals(2, buffer.size()); + assertThat(buffer.size()).isEqualTo(2); JsonReader reader2 = new JsonReader(buffer); reader2.beginObject(); reader2.endObject(); - assertEquals(0, buffer.size()); + assertThat(buffer.size()).isEqualTo(0); } @Test public void readArray() throws IOException { JsonReader reader = newReader("[true, true]"); reader.beginArray(); - assertEquals(true, reader.nextBoolean()); - assertEquals(true, reader.nextBoolean()); + assertThat(reader.nextBoolean()).isTrue(); + assertThat(reader.nextBoolean()).isTrue(); reader.endArray(); - assertEquals(JsonReader.Token.END_DOCUMENT, reader.peek()); + assertThat(reader.peek()).isEqualTo(JsonReader.Token.END_DOCUMENT); } @Test public void readEmptyArray() throws IOException { JsonReader reader = newReader("[]"); reader.beginArray(); - assertFalse(reader.hasNext()); + assertThat(reader.hasNext()).isFalse(); reader.endArray(); - assertEquals(JsonReader.Token.END_DOCUMENT, reader.peek()); + assertThat(reader.peek()).isEqualTo(JsonReader.Token.END_DOCUMENT); } @Test public void readObject() throws IOException { JsonReader reader = newReader("{\"a\": \"android\", \"b\": \"banana\"}"); reader.beginObject(); - assertEquals("a", reader.nextName()); - assertEquals("android", reader.nextString()); - assertEquals("b", reader.nextName()); - assertEquals("banana", reader.nextString()); + assertThat(reader.nextName()).isEqualTo("a"); + assertThat(reader.nextString()).isEqualTo("android"); + assertThat(reader.nextName()).isEqualTo("b"); + assertThat(reader.nextString()).isEqualTo("banana"); reader.endObject(); - assertEquals(JsonReader.Token.END_DOCUMENT, reader.peek()); + assertThat(reader.peek()).isEqualTo(JsonReader.Token.END_DOCUMENT); } @Test public void readObjectBuffer() throws IOException { Buffer buffer = new Buffer().writeUtf8("{\"a\": \"android\", \"b\": \"banana\"}"); JsonReader reader = new JsonReader(buffer); reader.beginObject(); - assertEquals("a", reader.nextName()); - assertEquals("android", reader.nextString()); - assertEquals("b", reader.nextName()); - assertEquals("banana", reader.nextString()); + assertThat(reader.nextName()).isEqualTo("a"); + assertThat(reader.nextString()).isEqualTo("android"); + assertThat(reader.nextName()).isEqualTo("b"); + assertThat(reader.nextString()).isEqualTo("banana"); reader.endObject(); - assertEquals(JsonReader.Token.END_DOCUMENT, reader.peek()); + assertThat(reader.peek()).isEqualTo(JsonReader.Token.END_DOCUMENT); } @Test public void readObjectSource() throws IOException { Buffer buffer = new Buffer().writeUtf8("{\"a\": \"android\", \"b\": \"banana\"}"); JsonReader reader = new JsonReader(buffer); reader.beginObject(); - assertEquals("a", reader.nextName()); - assertEquals("android", reader.nextString()); - assertEquals("b", reader.nextName()); - assertEquals("banana", reader.nextString()); + assertThat(reader.nextName()).isEqualTo("a"); + assertThat(reader.nextString()).isEqualTo("android"); + assertThat(reader.nextName()).isEqualTo("b"); + assertThat(reader.nextString()).isEqualTo("banana"); reader.endObject(); - assertEquals(JsonReader.Token.END_DOCUMENT, reader.peek()); + assertThat(reader.peek()).isEqualTo(JsonReader.Token.END_DOCUMENT); } @Test public void readEmptyObject() throws IOException { JsonReader reader = newReader("{}"); reader.beginObject(); - assertFalse(reader.hasNext()); + assertThat(reader.hasNext()).isFalse(); reader.endObject(); - assertEquals(JsonReader.Token.END_DOCUMENT, reader.peek()); + assertThat(reader.peek()).isEqualTo(JsonReader.Token.END_DOCUMENT); } @Test public void skipArray() throws IOException { JsonReader reader = newReader("{\"a\": [\"one\", \"two\", \"three\"], \"b\": 123}"); reader.beginObject(); - assertEquals("a", reader.nextName()); + assertThat(reader.nextName()).isEqualTo("a"); reader.skipValue(); - assertEquals("b", reader.nextName()); - assertEquals(123, reader.nextInt()); + assertThat(reader.nextName()).isEqualTo("b"); + assertThat(reader.nextInt()).isEqualTo(123); reader.endObject(); - assertEquals(JsonReader.Token.END_DOCUMENT, reader.peek()); + assertThat(reader.peek()).isEqualTo(JsonReader.Token.END_DOCUMENT); } @Test public void skipArrayAfterPeek() throws Exception { JsonReader reader = newReader("{\"a\": [\"one\", \"two\", \"three\"], \"b\": 123}"); reader.beginObject(); - assertEquals("a", reader.nextName()); - assertEquals(BEGIN_ARRAY, reader.peek()); + assertThat(reader.nextName()).isEqualTo("a"); + assertThat(reader.peek()).isEqualTo(BEGIN_ARRAY); reader.skipValue(); - assertEquals("b", reader.nextName()); - assertEquals(123, reader.nextInt()); + assertThat(reader.nextName()).isEqualTo("b"); + assertThat(reader.nextInt()).isEqualTo(123); reader.endObject(); - assertEquals(JsonReader.Token.END_DOCUMENT, reader.peek()); + assertThat(reader.peek()).isEqualTo(JsonReader.Token.END_DOCUMENT); } @Test public void skipTopLevelObject() throws Exception { JsonReader reader = newReader("{\"a\": [\"one\", \"two\", \"three\"], \"b\": 123}"); reader.skipValue(); - assertEquals(JsonReader.Token.END_DOCUMENT, reader.peek()); + assertThat(reader.peek()).isEqualTo(JsonReader.Token.END_DOCUMENT); } @Test public void skipObject() throws IOException { JsonReader reader = newReader( "{\"a\": { \"c\": [], \"d\": [true, true, {}] }, \"b\": \"banana\"}"); reader.beginObject(); - assertEquals("a", reader.nextName()); + assertThat(reader.nextName()).isEqualTo("a"); reader.skipValue(); - assertEquals("b", reader.nextName()); + assertThat(reader.nextName()).isEqualTo("b"); reader.skipValue(); reader.endObject(); - assertEquals(JsonReader.Token.END_DOCUMENT, reader.peek()); + assertThat(reader.peek()).isEqualTo(JsonReader.Token.END_DOCUMENT); } @Test public void skipObjectAfterPeek() throws Exception { @@ -159,38 +157,38 @@ public final class JsonReaderTest { + ", \"two\": { \"num\": 2 }" + ", \"three\": { \"num\": 3 }" + "}"; JsonReader reader = newReader(json); reader.beginObject(); - assertEquals("one", reader.nextName()); - assertEquals(BEGIN_OBJECT, reader.peek()); + assertThat(reader.nextName()).isEqualTo("one"); + assertThat(reader.peek()).isEqualTo(BEGIN_OBJECT); reader.skipValue(); - assertEquals("two", reader.nextName()); - assertEquals(BEGIN_OBJECT, reader.peek()); + assertThat(reader.nextName()).isEqualTo("two"); + assertThat(reader.peek()).isEqualTo(BEGIN_OBJECT); reader.skipValue(); - assertEquals("three", reader.nextName()); + assertThat(reader.nextName()).isEqualTo("three"); reader.skipValue(); reader.endObject(); - assertEquals(JsonReader.Token.END_DOCUMENT, reader.peek()); + assertThat(reader.peek()).isEqualTo(JsonReader.Token.END_DOCUMENT); } @Test public void skipInteger() throws IOException { JsonReader reader = newReader("{\"a\":123456789,\"b\":-123456789}"); reader.beginObject(); - assertEquals("a", reader.nextName()); + assertThat(reader.nextName()).isEqualTo("a"); reader.skipValue(); - assertEquals("b", reader.nextName()); + assertThat(reader.nextName()).isEqualTo("b"); reader.skipValue(); reader.endObject(); - assertEquals(JsonReader.Token.END_DOCUMENT, reader.peek()); + assertThat(reader.peek()).isEqualTo(JsonReader.Token.END_DOCUMENT); } @Test public void skipDouble() throws IOException { JsonReader reader = newReader("{\"a\":-123.456e-789,\"b\":123456789.0}"); reader.beginObject(); - assertEquals("a", reader.nextName()); + assertThat(reader.nextName()).isEqualTo("a"); reader.skipValue(); - assertEquals("b", reader.nextName()); + assertThat(reader.nextName()).isEqualTo("b"); reader.skipValue(); reader.endObject(); - assertEquals(JsonReader.Token.END_DOCUMENT, reader.peek()); + assertThat(reader.peek()).isEqualTo(JsonReader.Token.END_DOCUMENT); } @Test public void helloWorld() throws IOException { @@ -200,14 +198,14 @@ public final class JsonReaderTest { "}"; JsonReader reader = newReader(json); reader.beginObject(); - assertEquals("hello", reader.nextName()); - assertEquals(true, reader.nextBoolean()); - assertEquals("foo", reader.nextName()); + assertThat(reader.nextName()).isEqualTo("hello"); + assertThat(reader.nextBoolean()).isTrue(); + assertThat(reader.nextName()).isEqualTo("foo"); reader.beginArray(); - assertEquals("world", reader.nextString()); + assertThat(reader.nextString()).isEqualTo("world"); reader.endArray(); reader.endObject(); - assertEquals(JsonReader.Token.END_DOCUMENT, reader.peek()); + assertThat(reader.peek()).isEqualTo(JsonReader.Token.END_DOCUMENT); } @Test public void nullSource() { @@ -262,27 +260,27 @@ public final class JsonReaderTest { + "]"; JsonReader reader = newReader(json); reader.beginArray(); - assertEquals("a", reader.nextString()); - assertEquals("a\"", reader.nextString()); - assertEquals("\"", reader.nextString()); - assertEquals(":", reader.nextString()); - assertEquals(",", reader.nextString()); - assertEquals("\b", reader.nextString()); - assertEquals("\f", reader.nextString()); - assertEquals("\n", reader.nextString()); - assertEquals("\r", reader.nextString()); - assertEquals("\t", reader.nextString()); - assertEquals(" ", reader.nextString()); - assertEquals("\\", reader.nextString()); - assertEquals("{", reader.nextString()); - assertEquals("}", reader.nextString()); - assertEquals("[", reader.nextString()); - assertEquals("]", reader.nextString()); - assertEquals("\0", reader.nextString()); - assertEquals("\u0019", reader.nextString()); - assertEquals("\u20AC", reader.nextString()); + assertThat(reader.nextString()).isEqualTo("a"); + assertThat(reader.nextString()).isEqualTo("a\""); + assertThat(reader.nextString()).isEqualTo("\""); + assertThat(reader.nextString()).isEqualTo(":"); + assertThat(reader.nextString()).isEqualTo(","); + assertThat(reader.nextString()).isEqualTo("\b"); + assertThat(reader.nextString()).isEqualTo("\f"); + assertThat(reader.nextString()).isEqualTo("\n"); + assertThat(reader.nextString()).isEqualTo("\r"); + assertThat(reader.nextString()).isEqualTo("\t"); + assertThat(reader.nextString()).isEqualTo(" "); + assertThat(reader.nextString()).isEqualTo("\\"); + assertThat(reader.nextString()).isEqualTo("{"); + assertThat(reader.nextString()).isEqualTo("}"); + assertThat(reader.nextString()).isEqualTo("["); + assertThat(reader.nextString()).isEqualTo("]"); + assertThat(reader.nextString()).isEqualTo("\0"); + assertThat(reader.nextString()).isEqualTo("\u0019"); + assertThat(reader.nextString()).isEqualTo("\u20AC"); reader.endArray(); - assertEquals(JsonReader.Token.END_DOCUMENT, reader.peek()); + assertThat(reader.peek()).isEqualTo(JsonReader.Token.END_DOCUMENT); } @Test public void unescapingInvalidCharacters() throws IOException { @@ -321,9 +319,9 @@ public final class JsonReaderTest { @Test public void integersWithFractionalPartSpecified() throws IOException { JsonReader reader = newReader("[1.0,1.0,1.0]"); reader.beginArray(); - assertEquals(1.0, reader.nextDouble(), 0d); - assertEquals(1, reader.nextInt()); - assertEquals(1L, reader.nextLong()); + assertThat(reader.nextDouble()).isEqualTo(1.0); + assertThat(reader.nextInt()).isEqualTo(1); + assertThat(reader.nextLong()).isEqualTo(1L); } @Test public void doubles() throws IOException { @@ -338,17 +336,17 @@ public final class JsonReaderTest { + "2.718281828459045]"; JsonReader reader = newReader(json); reader.beginArray(); - assertEquals(-0.0, reader.nextDouble(), 0d); - assertEquals(1.0, reader.nextDouble(), 0d); - assertEquals(1.7976931348623157E308, reader.nextDouble(), 0d); - assertEquals(4.9E-324, reader.nextDouble(), 0d); - assertEquals(0.0, reader.nextDouble(), 0d); - assertEquals(-0.5, reader.nextDouble(), 0d); - assertEquals(2.2250738585072014E-308, reader.nextDouble(), 0d); - assertEquals(3.141592653589793, reader.nextDouble(), 0d); - assertEquals(2.718281828459045, reader.nextDouble(), 0d); + assertThat(reader.nextDouble()).isEqualTo(-0.0); + assertThat(reader.nextDouble()).isEqualTo(1.0); + assertThat(reader.nextDouble()).isEqualTo(1.7976931348623157E308); + assertThat(reader.nextDouble()).isEqualTo(4.9E-324); + assertThat(reader.nextDouble()).isEqualTo(0.0); + assertThat(reader.nextDouble()).isEqualTo(-0.5); + assertThat(reader.nextDouble()).isEqualTo(2.2250738585072014E-308); + assertThat(reader.nextDouble()).isEqualTo(3.141592653589793); + assertThat(reader.nextDouble()).isEqualTo(2.718281828459045); reader.endArray(); - assertEquals(JsonReader.Token.END_DOCUMENT, reader.peek()); + assertThat(reader.peek()).isEqualTo(JsonReader.Token.END_DOCUMENT); } @Test public void strictNonFiniteDoubles() throws IOException { @@ -379,9 +377,9 @@ public final class JsonReaderTest { JsonReader reader = newReader(json); reader.setLenient(true); reader.beginArray(); - assertTrue(Double.isNaN(reader.nextDouble())); - assertEquals(Double.NEGATIVE_INFINITY, reader.nextDouble(), 0d); - assertEquals(Double.POSITIVE_INFINITY, reader.nextDouble(), 0d); + assertThat(Double.isNaN(reader.nextDouble())).isTrue(); + assertThat(reader.nextDouble()).isEqualTo(Double.NEGATIVE_INFINITY); + assertThat(reader.nextDouble()).isEqualTo(Double.POSITIVE_INFINITY); reader.endArray(); } @@ -390,9 +388,9 @@ public final class JsonReaderTest { JsonReader reader = newReader(json); reader.setLenient(true); reader.beginArray(); - assertTrue(Double.isNaN(reader.nextDouble())); - assertEquals(Double.NEGATIVE_INFINITY, reader.nextDouble(), 0d); - assertEquals(Double.POSITIVE_INFINITY, reader.nextDouble(), 0d); + assertThat(reader.nextDouble()).isNaN(); + assertThat(reader.nextDouble()).isEqualTo(Double.NEGATIVE_INFINITY); + assertThat(reader.nextDouble()).isEqualTo(Double.POSITIVE_INFINITY); reader.endArray(); } @@ -415,29 +413,29 @@ public final class JsonReaderTest { + "9223372036854775807]"; JsonReader reader = newReader(json); reader.beginArray(); - assertEquals(0L, reader.nextLong()); - assertEquals(0, reader.nextInt()); - assertEquals(0.0, reader.nextDouble(), 0d); - assertEquals(1L, reader.nextLong()); - assertEquals(1, reader.nextInt()); - assertEquals(1.0, reader.nextDouble(), 0d); - assertEquals(-1L, reader.nextLong()); - assertEquals(-1, reader.nextInt()); - assertEquals(-1.0, reader.nextDouble(), 0d); + assertThat(reader.nextLong()).isEqualTo(0L); + assertThat(reader.nextInt()).isEqualTo(0); + assertThat(reader.nextDouble()).isEqualTo(0.0d); + assertThat(reader.nextLong()).isEqualTo(1L); + assertThat(reader.nextInt()).isEqualTo(1); + assertThat(reader.nextDouble()).isEqualTo(1.0d); + assertThat(reader.nextLong()).isEqualTo(-1L); + assertThat(reader.nextInt()).isEqualTo(-1); + assertThat(reader.nextDouble()).isEqualTo(-1.0d); try { reader.nextInt(); fail(); } catch (NumberFormatException expected) { } - assertEquals(Long.MIN_VALUE, reader.nextLong()); + assertThat(reader.nextLong()).isEqualTo(Long.MIN_VALUE); try { reader.nextInt(); fail(); } catch (NumberFormatException expected) { } - assertEquals(Long.MAX_VALUE, reader.nextLong()); + assertThat(reader.nextLong()).isEqualTo(Long.MAX_VALUE); reader.endArray(); - assertEquals(JsonReader.Token.END_DOCUMENT, reader.peek()); + assertThat(reader.peek()).isEqualTo(JsonReader.Token.END_DOCUMENT); } @Test @Ignore public void numberWithOctalPrefix() throws IOException { @@ -464,31 +462,31 @@ public final class JsonReaderTest { fail(); } catch (IOException expected) { } - assertEquals("01", reader.nextString()); + assertThat(reader.nextString()).isEqualTo("01"); reader.endArray(); - assertEquals(JsonReader.Token.END_DOCUMENT, reader.peek()); + assertThat(reader.peek()).isEqualTo(JsonReader.Token.END_DOCUMENT); } @Test public void booleans() throws IOException { JsonReader reader = newReader("[true,false]"); reader.beginArray(); - assertEquals(true, reader.nextBoolean()); - assertEquals(false, reader.nextBoolean()); + assertThat(reader.nextBoolean()).isTrue(); + assertThat(reader.nextBoolean()).isFalse(); reader.endArray(); - assertEquals(JsonReader.Token.END_DOCUMENT, reader.peek()); + assertThat(reader.peek()).isEqualTo(JsonReader.Token.END_DOCUMENT); } @Test public void peekingUnquotedStringsPrefixedWithBooleans() throws IOException { JsonReader reader = newReader("[truey]"); reader.setLenient(true); reader.beginArray(); - assertEquals(STRING, reader.peek()); + assertThat(reader.peek()).isEqualTo(STRING); try { reader.nextBoolean(); fail(); } catch (IllegalStateException expected) { } - assertEquals("truey", reader.nextString()); + assertThat(reader.nextString()).isEqualTo("truey"); reader.endArray(); } @@ -533,8 +531,8 @@ public final class JsonReaderTest { JsonReader reader = newReader("[" + s + "]"); reader.setLenient(true); reader.beginArray(); - assertEquals(JsonReader.Token.STRING, reader.peek()); - assertEquals(s, reader.nextString()); + assertThat(reader.peek()).isEqualTo(JsonReader.Token.STRING); + assertThat(reader.nextString()).isEqualTo(s); reader.endArray(); } @@ -542,36 +540,36 @@ public final class JsonReaderTest { JsonReader reader = newReader("[12.34e5x]"); reader.setLenient(true); reader.beginArray(); - assertEquals(STRING, reader.peek()); + assertThat(reader.peek()).isEqualTo(STRING); try { reader.nextInt(); fail(); } catch (IllegalStateException expected) { } - assertEquals("12.34e5x", reader.nextString()); + assertThat(reader.nextString()).isEqualTo("12.34e5x"); } @Test public void peekLongMinValue() throws IOException { JsonReader reader = newReader("[-9223372036854775808]"); reader.setLenient(true); reader.beginArray(); - assertEquals(NUMBER, reader.peek()); - assertEquals(-9223372036854775808L, reader.nextLong()); + assertThat(reader.peek()).isEqualTo(NUMBER); + assertThat(reader.nextLong()).isEqualTo(-9223372036854775808L); } @Test public void peekLongMaxValue() throws IOException { JsonReader reader = newReader("[9223372036854775807]"); reader.setLenient(true); reader.beginArray(); - assertEquals(NUMBER, reader.peek()); - assertEquals(9223372036854775807L, reader.nextLong()); + assertThat(reader.peek()).isEqualTo(NUMBER); + assertThat(reader.nextLong()).isEqualTo(9223372036854775807L); } @Test public void longLargerThanMaxLongThatWrapsAround() throws IOException { JsonReader reader = newReader("[22233720368547758070]"); reader.setLenient(true); reader.beginArray(); - assertEquals(NUMBER, reader.peek()); + assertThat(reader.peek()).isEqualTo(NUMBER); try { reader.nextLong(); fail(); @@ -583,7 +581,7 @@ public final class JsonReaderTest { JsonReader reader = newReader("[-22233720368547758070]"); reader.setLenient(true); reader.beginArray(); - assertEquals(NUMBER, reader.peek()); + assertThat(reader.peek()).isEqualTo(NUMBER); try { reader.nextLong(); fail(); @@ -599,7 +597,7 @@ public final class JsonReaderTest { JsonReader reader = newReader("[9223372036854775808]"); reader.setLenient(true); reader.beginArray(); - assertEquals(NUMBER, reader.peek()); + assertThat(reader.peek()).isEqualTo(NUMBER); try { reader.nextLong(); fail(); @@ -615,13 +613,13 @@ public final class JsonReaderTest { JsonReader reader = newReader("[-9223372036854775809]"); reader.setLenient(true); reader.beginArray(); - assertEquals(NUMBER, reader.peek()); + assertThat(reader.peek()).isEqualTo(NUMBER); try { reader.nextLong(); fail(); } catch (NumberFormatException expected) { } - assertEquals(-9223372036854775809d, reader.nextDouble(), 0d); + assertThat(reader.nextDouble()).isEqualTo(-9223372036854775809d); } /** @@ -632,7 +630,7 @@ public final class JsonReaderTest { String json = "[9223372036854775806.000]"; JsonReader reader = newReader(json); reader.beginArray(); - assertEquals(9223372036854775806L, reader.nextLong()); + assertThat(reader.nextLong()).isEqualTo(9223372036854775806L); reader.endArray(); } @@ -640,40 +638,40 @@ public final class JsonReaderTest { JsonReader reader = newReader("[-92233720368547758080]"); reader.setLenient(true); reader.beginArray(); - assertEquals(NUMBER, reader.peek()); + assertThat(reader.peek()).isEqualTo(NUMBER); try { reader.nextLong(); fail(); } catch (NumberFormatException expected) { } - assertEquals(-92233720368547758080d, reader.nextDouble(), 0d); + assertThat(reader.nextDouble()).isEqualTo(-92233720368547758080d); } @Test public void quotedNumberWithEscape() throws IOException { JsonReader reader = newReader("[\"12\u00334\"]"); reader.setLenient(true); reader.beginArray(); - assertEquals(STRING, reader.peek()); - assertEquals(1234, reader.nextInt()); + assertThat(reader.peek()).isEqualTo(STRING); + assertThat(reader.nextInt()).isEqualTo(1234); } @Test public void mixedCaseLiterals() throws IOException { JsonReader reader = newReader("[True,TruE,False,FALSE,NULL,nulL]"); reader.beginArray(); - assertEquals(true, reader.nextBoolean()); - assertEquals(true, reader.nextBoolean()); - assertEquals(false, reader.nextBoolean()); - assertEquals(false, reader.nextBoolean()); + assertThat(reader.nextBoolean()).isTrue(); + assertThat(reader.nextBoolean()).isTrue(); + assertThat(reader.nextBoolean()).isFalse(); + assertThat(reader.nextBoolean()).isFalse(); reader.nextNull(); reader.nextNull(); reader.endArray(); - assertEquals(JsonReader.Token.END_DOCUMENT, reader.peek()); + assertThat(reader.peek()).isEqualTo(JsonReader.Token.END_DOCUMENT); } @Test public void missingValue() throws IOException { JsonReader reader = newReader("{\"a\":}"); reader.beginObject(); - assertEquals("a", reader.nextName()); + assertThat(reader.nextName()).isEqualTo("a"); try { reader.nextString(); fail(); @@ -684,8 +682,8 @@ public final class JsonReaderTest { @Test public void prematureEndOfInput() throws IOException { JsonReader reader = newReader("{\"a\":true,"); reader.beginObject(); - assertEquals("a", reader.nextName()); - assertEquals(true, reader.nextBoolean()); + assertThat(reader.nextName()).isEqualTo("a"); + assertThat(reader.nextBoolean()).isTrue(); try { reader.nextName(); fail(); @@ -731,7 +729,7 @@ public final class JsonReaderTest { fail(); } catch (IllegalStateException expected) { } - assertEquals("a", reader.nextName()); + assertThat(reader.nextName()).isEqualTo("a"); try { reader.nextName(); fail(); @@ -757,7 +755,7 @@ public final class JsonReaderTest { fail(); } catch (IllegalStateException expected) { } - assertEquals(true, reader.nextBoolean()); + assertThat(reader.nextBoolean()).isTrue(); try { reader.nextString(); fail(); @@ -779,7 +777,7 @@ public final class JsonReaderTest { } catch (IllegalStateException expected) { } reader.endObject(); - assertEquals(JsonReader.Token.END_DOCUMENT, reader.peek()); + assertThat(reader.peek()).isEqualTo(JsonReader.Token.END_DOCUMENT); reader.close(); } @@ -791,7 +789,7 @@ public final class JsonReaderTest { fail(); } catch (NumberFormatException expected) { } - assertEquals(1.5d, reader.nextDouble(), 0d); + assertThat(reader.nextDouble()).isEqualTo(1.5d); reader.endArray(); } @@ -818,7 +816,7 @@ public final class JsonReaderTest { @Test public void strictNameValueSeparator() throws IOException { JsonReader reader = newReader("{\"a\"=true}"); reader.beginObject(); - assertEquals("a", reader.nextName()); + assertThat(reader.nextName()).isEqualTo("a"); try { reader.nextBoolean(); fail(); @@ -827,7 +825,7 @@ public final class JsonReaderTest { reader = newReader("{\"a\"=>true}"); reader.beginObject(); - assertEquals("a", reader.nextName()); + assertThat(reader.nextName()).isEqualTo("a"); try { reader.nextBoolean(); fail(); @@ -839,20 +837,20 @@ public final class JsonReaderTest { JsonReader reader = newReader("{\"a\"=true}"); reader.setLenient(true); reader.beginObject(); - assertEquals("a", reader.nextName()); - assertEquals(true, reader.nextBoolean()); + assertThat(reader.nextName()).isEqualTo("a"); + assertThat(reader.nextBoolean()).isTrue(); reader = newReader("{\"a\"=>true}"); reader.setLenient(true); reader.beginObject(); - assertEquals("a", reader.nextName()); - assertEquals(true, reader.nextBoolean()); + assertThat(reader.nextName()).isEqualTo("a"); + assertThat(reader.nextBoolean()).isTrue(); } @Test public void strictNameValueSeparatorWithSkipValue() throws IOException { JsonReader reader = newReader("{\"a\"=true}"); reader.beginObject(); - assertEquals("a", reader.nextName()); + assertThat(reader.nextName()).isEqualTo("a"); try { reader.skipValue(); fail(); @@ -861,7 +859,7 @@ public final class JsonReaderTest { reader = newReader("{\"a\"=>true}"); reader.beginObject(); - assertEquals("a", reader.nextName()); + assertThat(reader.nextName()).isEqualTo("a"); try { reader.skipValue(); fail(); @@ -872,19 +870,19 @@ public final class JsonReaderTest { @Test public void commentsInStringValue() throws Exception { JsonReader reader = newReader("[\"// comment\"]"); reader.beginArray(); - assertEquals("// comment", reader.nextString()); + assertThat(reader.nextString()).isEqualTo("// comment"); reader.endArray(); reader = newReader("{\"a\":\"#someComment\"}"); reader.beginObject(); - assertEquals("a", reader.nextName()); - assertEquals("#someComment", reader.nextString()); + assertThat(reader.nextName()).isEqualTo("a"); + assertThat(reader.nextString()).isEqualTo("#someComment"); reader.endObject(); reader = newReader("{\"#//a\":\"#some //Comment\"}"); reader.beginObject(); - assertEquals("#//a", reader.nextName()); - assertEquals("#some //Comment", reader.nextString()); + assertThat(reader.nextName()).isEqualTo("#//a"); + assertThat(reader.nextString()).isEqualTo("#some //Comment"); reader.endObject(); } @@ -918,22 +916,22 @@ public final class JsonReaderTest { JsonReader reader = newReader("[// comment \n true]"); reader.setLenient(true); reader.beginArray(); - assertEquals(true, reader.nextBoolean()); + assertThat(reader.nextBoolean()).isTrue(); reader = newReader("[# comment \n true]"); reader.setLenient(true); reader.beginArray(); - assertEquals(true, reader.nextBoolean()); + assertThat(reader.nextBoolean()).isTrue(); reader = newReader("[/* comment */ true]"); reader.setLenient(true); reader.beginArray(); - assertEquals(true, reader.nextBoolean()); + assertThat(reader.nextBoolean()).isTrue(); reader = newReader("a//"); reader.setLenient(true); - assertEquals("a", reader.nextString()); - assertEquals(JsonReader.Token.END_DOCUMENT, reader.peek()); + assertThat(reader.nextString()).isEqualTo("a"); + assertThat(reader.peek()).isEqualTo(JsonReader.Token.END_DOCUMENT); } @Test public void strictCommentsWithSkipValue() throws IOException { @@ -976,14 +974,14 @@ public final class JsonReaderTest { JsonReader reader = newReader("{a:true}"); reader.setLenient(true); reader.beginObject(); - assertEquals("a", reader.nextName()); + assertThat(reader.nextName()).isEqualTo("a"); } @Test public void jsonIsSingleUnquotedString() throws IOException { JsonReader reader = newReader("abc"); reader.setLenient(true); - assertEquals("abc", reader.nextString()); - assertEquals(JsonReader.Token.END_DOCUMENT, reader.peek()); + assertThat(reader.nextString()).isEqualTo("abc"); + assertThat(reader.peek()).isEqualTo(JsonReader.Token.END_DOCUMENT); } @Test public void strictUnquotedNamesWithSkipValue() throws IOException { @@ -1010,7 +1008,7 @@ public final class JsonReaderTest { JsonReader reader = newReader("{'a':true}"); reader.setLenient(true); reader.beginObject(); - assertEquals("a", reader.nextName()); + assertThat(reader.nextName()).isEqualTo("a"); } @Test public void strictSingleQuotedNamesWithSkipValue() throws IOException { @@ -1047,14 +1045,14 @@ public final class JsonReaderTest { JsonReader reader = newReader("[a]"); reader.setLenient(true); reader.beginArray(); - assertEquals("a", reader.nextString()); + assertThat(reader.nextString()).isEqualTo("a"); } @Test public void lenientUnquotedStringsDelimitedByComment() throws IOException { JsonReader reader = newReader("[a#comment\n]"); reader.setLenient(true); reader.beginArray(); - assertEquals("a", reader.nextString()); + assertThat(reader.nextString()).isEqualTo("a"); reader.endArray(); } @@ -1072,7 +1070,7 @@ public final class JsonReaderTest { JsonReader reader = newReader("['a']"); reader.setLenient(true); reader.beginArray(); - assertEquals("a", reader.nextString()); + assertThat(reader.nextString()).isEqualTo("a"); } @Test public void strictSingleQuotedStringsWithSkipValue() throws IOException { @@ -1100,8 +1098,8 @@ public final class JsonReaderTest { JsonReader reader = newReader("[true;true]"); reader.setLenient(true); reader.beginArray(); - assertEquals(true, reader.nextBoolean()); - assertEquals(true, reader.nextBoolean()); + assertThat(reader.nextBoolean()).isTrue(); + assertThat(reader.nextBoolean()).isTrue(); } @Test public void strictSemicolonDelimitedArrayWithSkipValue() throws IOException { @@ -1118,7 +1116,7 @@ public final class JsonReaderTest { @Test public void strictSemicolonDelimitedNameValuePair() throws IOException { JsonReader reader = newReader("{\"a\":true;\"b\":true}"); reader.beginObject(); - assertEquals("a", reader.nextName()); + assertThat(reader.nextName()).isEqualTo("a"); try { reader.nextBoolean(); reader.nextName(); @@ -1131,15 +1129,15 @@ public final class JsonReaderTest { JsonReader reader = newReader("{\"a\":true;\"b\":true}"); reader.setLenient(true); reader.beginObject(); - assertEquals("a", reader.nextName()); - assertEquals(true, reader.nextBoolean()); - assertEquals("b", reader.nextName()); + assertThat(reader.nextName()).isEqualTo("a"); + assertThat(reader.nextBoolean()).isTrue(); + assertThat(reader.nextName()).isEqualTo("b"); } @Test public void strictSemicolonDelimitedNameValuePairWithSkipValue() throws IOException { JsonReader reader = newReader("{\"a\":true;\"b\":true}"); reader.beginObject(); - assertEquals("a", reader.nextName()); + assertThat(reader.nextName()).isEqualTo("a"); try { reader.skipValue(); reader.skipValue(); @@ -1151,7 +1149,7 @@ public final class JsonReaderTest { @Test public void strictUnnecessaryArraySeparators() throws IOException { JsonReader reader = newReader("[true,,true]"); reader.beginArray(); - assertEquals(true, reader.nextBoolean()); + assertThat(reader.nextBoolean()).isTrue(); try { reader.nextNull(); fail(); @@ -1168,7 +1166,7 @@ public final class JsonReaderTest { reader = newReader("[true,]"); reader.beginArray(); - assertEquals(true, reader.nextBoolean()); + assertThat(reader.nextBoolean()).isTrue(); try { reader.nextNull(); fail(); @@ -1188,22 +1186,22 @@ public final class JsonReaderTest { JsonReader reader = newReader("[true,,true]"); reader.setLenient(true); reader.beginArray(); - assertEquals(true, reader.nextBoolean()); + assertThat(reader.nextBoolean()).isTrue(); reader.nextNull(); - assertEquals(true, reader.nextBoolean()); + assertThat(reader.nextBoolean()).isTrue(); reader.endArray(); reader = newReader("[,true]"); reader.setLenient(true); reader.beginArray(); reader.nextNull(); - assertEquals(true, reader.nextBoolean()); + assertThat(reader.nextBoolean()).isTrue(); reader.endArray(); reader = newReader("[true,]"); reader.setLenient(true); reader.beginArray(); - assertEquals(true, reader.nextBoolean()); + assertThat(reader.nextBoolean()).isTrue(); reader.nextNull(); reader.endArray(); @@ -1218,7 +1216,7 @@ public final class JsonReaderTest { @Test public void strictUnnecessaryArraySeparatorsWithSkipValue() throws IOException { JsonReader reader = newReader("[true,,true]"); reader.beginArray(); - assertEquals(true, reader.nextBoolean()); + assertThat(reader.nextBoolean()).isTrue(); try { reader.skipValue(); fail(); @@ -1235,7 +1233,7 @@ public final class JsonReaderTest { reader = newReader("[true,]"); reader.beginArray(); - assertEquals(true, reader.nextBoolean()); + assertThat(reader.nextBoolean()).isTrue(); try { reader.skipValue(); fail(); @@ -1267,10 +1265,10 @@ public final class JsonReaderTest { reader.setLenient(true); reader.beginArray(); reader.endArray(); - assertEquals(true, reader.nextBoolean()); + assertThat(reader.nextBoolean()).isTrue(); reader.beginObject(); reader.endObject(); - assertEquals(JsonReader.Token.END_DOCUMENT, reader.peek()); + assertThat(reader.peek()).isEqualTo(JsonReader.Token.END_DOCUMENT); } @Test public void strictMultipleTopLevelValuesWithSkipValue() throws IOException { @@ -1296,8 +1294,8 @@ public final class JsonReaderTest { @Test public void lenientTopLevelString() throws IOException { JsonReader reader = newReader("\"a\""); reader.setLenient(true); - assertEquals("a", reader.nextString()); - assertEquals(JsonReader.Token.END_DOCUMENT, reader.peek()); + assertThat(reader.nextString()).isEqualTo("a"); + assertThat(reader.peek()).isEqualTo(JsonReader.Token.END_DOCUMENT); } @Test public void strictTopLevelValueType() { @@ -1312,7 +1310,7 @@ public final class JsonReaderTest { @Test public void lenientTopLevelValueType() throws IOException { JsonReader reader = newReader("true"); reader.setLenient(true); - assertEquals(true, reader.nextBoolean()); + assertThat(reader.nextBoolean()).isTrue(); } @Test public void strictTopLevelValueTypeWithSkipValue() { @@ -1393,7 +1391,7 @@ public final class JsonReaderTest { reader1.peek(); fail(); } catch (IOException expected) { - assertEquals(message, expected.getMessage()); + assertThat(expected).hasMessage(message); } // Also validate that it works when skipping. @@ -1405,7 +1403,7 @@ public final class JsonReaderTest { reader2.peek(); fail(); } catch (IOException expected) { - assertEquals(message, expected.getMessage()); + assertThat(expected).hasMessage(message); } } @@ -1422,7 +1420,7 @@ public final class JsonReaderTest { reader.peek(); fail(); } catch (IOException expected) { - assertEquals("Expected value at path $[1].a[2]", expected.getMessage()); + assertThat(expected).hasMessage("Expected value at path $[1].a[2]"); } } @@ -1430,7 +1428,7 @@ public final class JsonReaderTest { JsonReader reader = newReader("[0." + repeat('9', 8192) + "]"); reader.beginArray(); try { - assertEquals(1d, reader.nextDouble(), 0d); + assertThat(reader.nextDouble()).isEqualTo(1d); fail(); } catch (IOException expected) { } @@ -1440,10 +1438,10 @@ public final class JsonReaderTest { JsonReader reader = newReader("[0." + repeat('9', 8192) + "]"); reader.setLenient(true); reader.beginArray(); - assertEquals(JsonReader.Token.STRING, reader.peek()); - assertEquals(1d, reader.nextDouble(), 0d); + assertThat(reader.peek()).isEqualTo(JsonReader.Token.STRING); + assertThat(reader.nextDouble()).isEqualTo(1d); reader.endArray(); - assertEquals(JsonReader.Token.END_DOCUMENT, reader.peek()); + assertThat(reader.peek()).isEqualTo(JsonReader.Token.END_DOCUMENT); } @Test public void veryLongUnquotedLiteral() throws IOException { @@ -1451,7 +1449,7 @@ public final class JsonReaderTest { JsonReader reader = newReader("[" + literal + "]"); reader.setLenient(true); reader.beginArray(); - assertEquals(literal, reader.nextString()); + assertThat(reader.nextString()).isEqualTo(literal); reader.endArray(); } @@ -1462,12 +1460,13 @@ public final class JsonReaderTest { for (int i = 0; i < 40; i++) { reader.beginArray(); } - assertEquals("$[0][0][0][0][0][0][0][0][0][0][0][0][0][0][0][0][0][0][0][0][0][0][0][0][0][0]" - + "[0][0][0][0][0][0][0][0][0][0][0][0][0][0]", reader.getPath()); + assertThat(reader.getPath()).isEqualTo( + "$[0][0][0][0][0][0][0][0][0][0][0][0][0][0][0][0][0][0][0][0][0][0][0][0][0][0]" + + "[0][0][0][0][0][0][0][0][0][0][0][0][0][0]"); for (int i = 0; i < 40; i++) { reader.endArray(); } - assertEquals(JsonReader.Token.END_DOCUMENT, reader.peek()); + assertThat(reader.peek()).isEqualTo(JsonReader.Token.END_DOCUMENT); } @Test public void deeplyNestedObjects() throws IOException { @@ -1481,15 +1480,15 @@ public final class JsonReaderTest { JsonReader reader = newReader(json); for (int i = 0; i < 40; i++) { reader.beginObject(); - assertEquals("a", reader.nextName()); + assertThat(reader.nextName()).isEqualTo("a"); } - assertEquals("$.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a" - + ".a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a", reader.getPath()); - assertEquals(true, reader.nextBoolean()); + assertThat(reader.getPath()).isEqualTo("$.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a" + + ".a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a"); + assertThat(reader.nextBoolean()).isTrue(); for (int i = 0; i < 40; i++) { reader.endObject(); } - assertEquals(JsonReader.Token.END_DOCUMENT, reader.peek()); + assertThat(reader.peek()).isEqualTo(JsonReader.Token.END_DOCUMENT); } // http://code.google.com/p/google-gson/issues/detail?id=409 @@ -1527,8 +1526,8 @@ public final class JsonReaderTest { JsonReader reader = newReader("{\"a\":\"android\"x"); reader.setLenient(true); reader.beginObject(); - assertEquals("a", reader.nextName()); - assertEquals("android", reader.nextString()); + assertThat(reader.nextName()).isEqualTo("a"); + assertThat(reader.nextString()).isEqualTo("android"); try { reader.peek(); fail(); @@ -1543,7 +1542,7 @@ public final class JsonReaderTest { String json = "[\"" + string + "\"]"; JsonReader reader = newReader(json); reader.beginArray(); - assertEquals(string, reader.nextString()); + assertThat(reader.nextString()).isEqualTo(string); reader.endArray(); } @@ -1555,7 +1554,7 @@ public final class JsonReaderTest { JsonReader reader = newReader(json); reader.setLenient(true); reader.beginArray(); - assertEquals(string, reader.nextString()); + assertThat(reader.nextString()).isEqualTo(string); reader.endArray(); } @@ -1567,7 +1566,7 @@ public final class JsonReaderTest { JsonReader reader = newReader(json); reader.setLenient(true); reader.beginArray(); - assertEquals(string, reader.nextString()); + assertThat(reader.nextString()).isEqualTo(string); try { reader.peek(); fail(); @@ -1587,7 +1586,7 @@ public final class JsonReaderTest { JsonReader reader = newReader(repeat('x', 8192)); reader.setLenient(true); reader.skipValue(); - assertEquals(JsonReader.Token.END_DOCUMENT, reader.peek()); + assertThat(reader.peek()).isEqualTo(JsonReader.Token.END_DOCUMENT); } @Test public void skipVeryLongQuotedString() throws IOException { @@ -1601,49 +1600,49 @@ public final class JsonReaderTest { JsonReader reader = newReader("\"" + repeat('x', 8192) + "\""); reader.setLenient(true); reader.skipValue(); - assertEquals(JsonReader.Token.END_DOCUMENT, reader.peek()); + assertThat(reader.peek()).isEqualTo(JsonReader.Token.END_DOCUMENT); } @Test public void stringAsNumberWithTruncatedExponent() throws IOException { JsonReader reader = newReader("[123e]"); reader.setLenient(true); reader.beginArray(); - assertEquals(STRING, reader.peek()); + assertThat(reader.peek()).isEqualTo(STRING); } @Test public void stringAsNumberWithDigitAndNonDigitExponent() throws IOException { JsonReader reader = newReader("[123e4b]"); reader.setLenient(true); reader.beginArray(); - assertEquals(STRING, reader.peek()); + assertThat(reader.peek()).isEqualTo(STRING); } @Test public void stringAsNumberWithNonDigitExponent() throws IOException { JsonReader reader = newReader("[123eb]"); reader.setLenient(true); reader.beginArray(); - assertEquals(STRING, reader.peek()); + assertThat(reader.peek()).isEqualTo(STRING); } @Test public void emptyStringName() throws IOException { JsonReader reader = newReader("{\"\":true}"); reader.setLenient(true); - assertEquals(BEGIN_OBJECT, reader.peek()); + assertThat(reader.peek()).isEqualTo(BEGIN_OBJECT); reader.beginObject(); - assertEquals(NAME, reader.peek()); - assertEquals("", reader.nextName()); - assertEquals(JsonReader.Token.BOOLEAN, reader.peek()); - assertEquals(true, reader.nextBoolean()); - assertEquals(JsonReader.Token.END_OBJECT, reader.peek()); + assertThat(reader.peek()).isEqualTo(NAME); + assertThat(reader.nextName()).isEqualTo(""); + assertThat(reader.peek()).isEqualTo(JsonReader.Token.BOOLEAN); + assertThat(reader.nextBoolean()).isTrue(); + assertThat(reader.peek()).isEqualTo(JsonReader.Token.END_OBJECT); reader.endObject(); - assertEquals(JsonReader.Token.END_DOCUMENT, reader.peek()); + assertThat(reader.peek()).isEqualTo(JsonReader.Token.END_DOCUMENT); } @Test public void strictExtraCommasInMaps() throws IOException { JsonReader reader = newReader("{\"a\":\"b\",}"); reader.beginObject(); - assertEquals("a", reader.nextName()); - assertEquals("b", reader.nextString()); + assertThat(reader.nextName()).isEqualTo("a"); + assertThat(reader.nextString()).isEqualTo("b"); try { reader.peek(); fail(); @@ -1655,8 +1654,8 @@ public final class JsonReaderTest { JsonReader reader = newReader("{\"a\":\"b\",}"); reader.setLenient(true); reader.beginObject(); - assertEquals("a", reader.nextName()); - assertEquals("b", reader.nextString()); + assertThat(reader.nextName()).isEqualTo("a"); + assertThat(reader.nextString()).isEqualTo("b"); try { reader.peek(); fail(); @@ -1720,7 +1719,7 @@ public final class JsonReaderTest { JsonReader reader = newReader("[\"string"); reader.setLenient(true); reader.beginArray(); - assertEquals(JsonReader.Token.STRING, reader.peek()); + assertThat(reader.peek()).isEqualTo(JsonReader.Token.STRING); try { reader.nextString(); fail(); @@ -1741,13 +1740,13 @@ public final class JsonReaderTest { } else if (expectation == END_ARRAY) { reader.endArray(); } else if (expectation == NAME) { - assertEquals("name", reader.nextName()); + assertThat(reader.nextName()).isEqualTo("name"); } else if (expectation == BOOLEAN) { - assertEquals(false, reader.nextBoolean()); + assertThat(reader.nextBoolean()).isFalse(); } else if (expectation == STRING) { - assertEquals("string", reader.nextString()); + assertThat(reader.nextString()).isEqualTo("string"); } else if (expectation == NUMBER) { - assertEquals(123, reader.nextInt()); + assertThat(reader.nextInt()).isEqualTo(123); } else if (expectation == NULL) { reader.nextNull(); } else if (expectation == IOException.class) { diff --git a/moshi/src/test/java/com/squareup/moshi/JsonWriterTest.java b/moshi/src/test/java/com/squareup/moshi/JsonWriterTest.java index 4978a23..ed69262 100644 --- a/moshi/src/test/java/com/squareup/moshi/JsonWriterTest.java +++ b/moshi/src/test/java/com/squareup/moshi/JsonWriterTest.java @@ -21,7 +21,7 @@ import java.math.BigInteger; import okio.Buffer; import org.junit.Test; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; public final class JsonWriterTest { @@ -33,7 +33,7 @@ public final class JsonWriterTest { jsonWriter.nullValue(); jsonWriter.endObject(); jsonWriter.close(); - assertEquals("{}", buffer.readUtf8()); + assertThat(buffer.readUtf8()).isEqualTo("{}"); } @Test public void nullsValuesSerializedWhenConfigured() throws IOException { @@ -45,7 +45,7 @@ public final class JsonWriterTest { jsonWriter.nullValue(); jsonWriter.endObject(); jsonWriter.close(); - assertEquals("{\"a\":null}", buffer.readUtf8()); + assertThat(buffer.readUtf8()).isEqualTo("{\"a\":null}"); } @Test public void wrongTopLevelType() throws IOException { @@ -147,7 +147,7 @@ public final class JsonWriterTest { jsonWriter.name("a"); jsonWriter.value((String) null); jsonWriter.endObject(); - assertEquals("{\"a\":null}", buffer.readUtf8()); + assertThat(buffer.readUtf8()).isEqualTo("{\"a\":null}"); } @Test public void nonFiniteDoubles() throws IOException { @@ -207,7 +207,7 @@ public final class JsonWriterTest { jsonWriter.value(Math.E); jsonWriter.endArray(); jsonWriter.close(); - assertEquals("[-0.0," + assertThat(buffer.readUtf8()).isEqualTo("[-0.0," + "1.0," + "1.7976931348623157E308," + "4.9E-324," @@ -215,7 +215,7 @@ public final class JsonWriterTest { + "-0.5," + "2.2250738585072014E-308," + "3.141592653589793," - + "2.718281828459045]", buffer.readUtf8()); + + "2.718281828459045]"); } @Test public void longs() throws IOException { @@ -229,11 +229,11 @@ public final class JsonWriterTest { jsonWriter.value(Long.MAX_VALUE); jsonWriter.endArray(); jsonWriter.close(); - assertEquals("[0," + assertThat(buffer.readUtf8()).isEqualTo("[0," + "1," + "-1," + "-9223372036854775808," - + "9223372036854775807]", buffer.readUtf8()); + + "9223372036854775807]"); } @Test public void numbers() throws IOException { @@ -246,10 +246,10 @@ public final class JsonWriterTest { jsonWriter.value(new BigDecimal("3.141592653589793238462643383")); jsonWriter.endArray(); jsonWriter.close(); - assertEquals("[0," + assertThat(buffer.readUtf8()).isEqualTo("[0," + "9223372036854775808," + "-9223372036854775809," - + "3.141592653589793238462643383]", buffer.readUtf8()); + + "3.141592653589793238462643383]"); } @Test public void booleans() throws IOException { @@ -259,7 +259,7 @@ public final class JsonWriterTest { jsonWriter.value(true); jsonWriter.value(false); jsonWriter.endArray(); - assertEquals("[true,false]", buffer.readUtf8()); + assertThat(buffer.readUtf8()).isEqualTo("[true,false]"); } @Test public void nulls() throws IOException { @@ -268,7 +268,7 @@ public final class JsonWriterTest { jsonWriter.beginArray(); jsonWriter.nullValue(); jsonWriter.endArray(); - assertEquals("[null]", buffer.readUtf8()); + assertThat(buffer.readUtf8()).isEqualTo("[null]"); } @Test public void strings() throws IOException { @@ -294,7 +294,7 @@ public final class JsonWriterTest { jsonWriter.value("\0"); jsonWriter.value("\u0019"); jsonWriter.endArray(); - assertEquals("[\"a\"," + assertThat(buffer.readUtf8()).isEqualTo("[\"a\"," + "\"a\\\"\"," + "\"\\\"\"," + "\":\"," @@ -311,7 +311,7 @@ public final class JsonWriterTest { + "\"[\"," + "\"]\"," + "\"\\u0000\"," - + "\"\\u0019\"]", buffer.readUtf8()); + + "\"\\u0019\"]"); } @Test public void unicodeLineBreaksEscaped() throws IOException { @@ -320,7 +320,7 @@ public final class JsonWriterTest { jsonWriter.beginArray(); jsonWriter.value("\u2028 \u2029"); jsonWriter.endArray(); - assertEquals("[\"\\u2028 \\u2029\"]", buffer.readUtf8()); + assertThat(buffer.readUtf8()).isEqualTo("[\"\\u2028 \\u2029\"]"); } @Test public void emptyArray() throws IOException { @@ -328,7 +328,7 @@ public final class JsonWriterTest { JsonWriter jsonWriter = new JsonWriter(buffer); jsonWriter.beginArray(); jsonWriter.endArray(); - assertEquals("[]", buffer.readUtf8()); + assertThat(buffer.readUtf8()).isEqualTo("[]"); } @Test public void emptyObject() throws IOException { @@ -336,7 +336,7 @@ public final class JsonWriterTest { JsonWriter jsonWriter = new JsonWriter(buffer); jsonWriter.beginObject(); jsonWriter.endObject(); - assertEquals("{}", buffer.readUtf8()); + assertThat(buffer.readUtf8()).isEqualTo("{}"); } @Test public void objectsInArrays() throws IOException { @@ -352,8 +352,8 @@ public final class JsonWriterTest { jsonWriter.name("d").value(true); jsonWriter.endObject(); jsonWriter.endArray(); - assertEquals("[{\"a\":5,\"b\":false}," - + "{\"c\":6,\"d\":true}]", buffer.readUtf8()); + assertThat(buffer.readUtf8()).isEqualTo("[{\"a\":5,\"b\":false}," + + "{\"c\":6,\"d\":true}]"); } @Test public void arraysInObjects() throws IOException { @@ -371,8 +371,8 @@ public final class JsonWriterTest { jsonWriter.value(true); jsonWriter.endArray(); jsonWriter.endObject(); - assertEquals("{\"a\":[5,false]," - + "\"b\":[6,true]}", buffer.readUtf8()); + assertThat(buffer.readUtf8()).isEqualTo("{\"a\":[5,false]," + + "\"b\":[6,true]}"); } @Test public void deepNestingArrays() throws IOException { @@ -384,7 +384,7 @@ public final class JsonWriterTest { for (int i = 0; i < 20; i++) { jsonWriter.endArray(); } - assertEquals("[[[[[[[[[[[[[[[[[[[[]]]]]]]]]]]]]]]]]]]]", buffer.readUtf8()); + assertThat(buffer.readUtf8()).isEqualTo("[[[[[[[[[[[[[[[[[[[[]]]]]]]]]]]]]]]]]]]]"); } @Test public void deepNestingObjects() throws IOException { @@ -399,9 +399,10 @@ public final class JsonWriterTest { jsonWriter.endObject(); } jsonWriter.endObject(); - assertEquals("{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":" + assertThat(buffer.readUtf8()).isEqualTo( + "{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":" + "{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{\"a\":{" - + "}}}}}}}}}}}}}}}}}}}}}", buffer.readUtf8()); + + "}}}}}}}}}}}}}}}}}}}}}"); } @Test public void repeatedName() throws IOException { @@ -412,7 +413,7 @@ public final class JsonWriterTest { jsonWriter.name("a").value(false); jsonWriter.endObject(); // JsonWriter doesn't attempt to detect duplicate names - assertEquals("{\"a\":true,\"a\":false}", buffer.readUtf8()); + assertThat(buffer.readUtf8()).isEqualTo("{\"a\":true,\"a\":false}"); } @Test public void prettyPrintObject() throws IOException { @@ -450,7 +451,7 @@ public final class JsonWriterTest { + " \"i\": 9.0\n" + " }\n" + "}"; - assertEquals(expected, buffer.readUtf8()); + assertThat(buffer.readUtf8()).isEqualTo(expected); } @Test public void prettyPrintArray() throws IOException { @@ -487,7 +488,7 @@ public final class JsonWriterTest { + " 9.0\n" + " ]\n" + "]"; - assertEquals(expected, buffer.readUtf8()); + assertThat(buffer.readUtf8()).isEqualTo(expected); } @Test public void lenientWriterPermitsMultipleTopLevelValues() throws IOException { @@ -499,7 +500,7 @@ public final class JsonWriterTest { writer.beginArray(); writer.endArray(); writer.close(); - assertEquals("[][]", buffer.readUtf8()); + assertThat(buffer.readUtf8()).isEqualTo("[][]"); } @Test public void strictWriterDoesNotPermitMultipleTopLevelValues() throws IOException { diff --git a/moshi/src/test/java/com/squareup/moshi/LinkedHashTreeMapTest.java b/moshi/src/test/java/com/squareup/moshi/LinkedHashTreeMapTest.java index 5785841..f8c605c 100644 --- a/moshi/src/test/java/com/squareup/moshi/LinkedHashTreeMapTest.java +++ b/moshi/src/test/java/com/squareup/moshi/LinkedHashTreeMapTest.java @@ -18,18 +18,12 @@ package com.squareup.moshi; import com.squareup.moshi.LinkedHashTreeMap.AvlBuilder; import com.squareup.moshi.LinkedHashTreeMap.AvlIterator; import com.squareup.moshi.LinkedHashTreeMap.Node; -import java.util.ArrayList; -import java.util.Arrays; import java.util.Iterator; import java.util.Map; import java.util.Random; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; public final class LinkedHashTreeMapTest { @@ -38,8 +32,8 @@ public final class LinkedHashTreeMapTest { map.put("a", "android"); map.put("c", "cola"); map.put("b", "bbq"); - assertIterationOrder(map.keySet(), "a", "c", "b"); - assertIterationOrder(map.values(), "android", "cola", "bbq"); + assertThat(map.keySet()).containsExactly("a", "c", "b"); + assertThat(map.values()).containsExactly("android", "cola", "bbq"); } @Test public void removeRootDoesNotDoubleUnlink() { @@ -52,7 +46,7 @@ public final class LinkedHashTreeMapTest { it.next(); it.next(); it.remove(); - assertIterationOrder(map.keySet(), "a", "c"); + assertThat(map.keySet()).containsExactly("a", "c"); } @Test public void putNullKeyFails() { @@ -73,34 +67,34 @@ public final class LinkedHashTreeMapTest { } @Test public void ContainsNonComparableKeyReturnsFalse() { - LinkedHashTreeMap map = new LinkedHashTreeMap<>(); + LinkedHashTreeMap map = new LinkedHashTreeMap<>(); map.put("a", "android"); - assertFalse(map.containsKey(new Object())); + assertThat(map).doesNotContainKey(new Object()); } @Test public void containsNullKeyIsAlwaysFalse() { LinkedHashTreeMap map = new LinkedHashTreeMap<>(); map.put("a", "android"); - assertFalse(map.containsKey(null)); + assertThat(map).doesNotContainKey(null); } @Test public void putOverrides() throws Exception { LinkedHashTreeMap map = new LinkedHashTreeMap<>(); - assertNull(map.put("d", "donut")); - assertNull(map.put("e", "eclair")); - assertNull(map.put("f", "froyo")); - assertEquals(3, map.size()); + assertThat(map.put("d", "donut")).isNull(); + assertThat(map.put("e", "eclair")).isNull(); + assertThat(map.put("f", "froyo")).isNull(); + assertThat(map.size()).isEqualTo(3); - assertEquals("donut", map.get("d")); - assertEquals("donut", map.put("d", "done")); - assertEquals(3, map.size()); + assertThat(map.get("d")).isEqualTo("donut"); + assertThat(map.put("d", "done")).isEqualTo("donut"); + assertThat(map).hasSize(3); } @Test public void emptyStringValues() { LinkedHashTreeMap map = new LinkedHashTreeMap<>(); map.put("a", ""); - assertTrue(map.containsKey("a")); - assertEquals("", map.get("a")); + assertThat(map.containsKey("a")).isTrue(); + assertThat(map.get("a")).isEqualTo(""); } // NOTE that this does not happen every time, but given the below predictable random, @@ -117,8 +111,8 @@ public final class LinkedHashTreeMapTest { for (int i = 0; i < keys.length; i++) { String key = keys[i]; - assertTrue(map.containsKey(key)); - assertEquals("" + i, map.get(key)); + assertThat(map.containsKey(key)).isTrue(); + assertThat(map.get(key)).isEqualTo("" + i); } } @@ -128,8 +122,8 @@ public final class LinkedHashTreeMapTest { map.put("c", "cola"); map.put("b", "bbq"); map.clear(); - assertIterationOrder(map.keySet()); - assertEquals(0, map.size()); + assertThat(map.keySet()).containsExactly(); + assertThat(map).isEmpty(); } @Test public void equalsAndHashCode() throws Exception { @@ -145,8 +139,8 @@ public final class LinkedHashTreeMapTest { map2.put("D", 4); map2.put("A", 1); - assertEquals(map1, map2); - assertEquals(map1.hashCode(), map2.hashCode()); + assertThat(map2).isEqualTo(map1); + assertThat(map2.hashCode()).isEqualTo(map1.hashCode()); } @Test public void avlWalker() { @@ -166,9 +160,9 @@ public final class LinkedHashTreeMapTest { AvlIterator iterator = new AvlIterator<>(); iterator.reset(root); for (String value : values) { - assertEquals(value, iterator.next().getKey()); + assertThat(iterator.next().getKey()).isEqualTo(value); } - assertNull(iterator.next()); + assertThat(iterator.next()).isNull(); } @Test public void avlBuilder() { @@ -221,7 +215,7 @@ public final class LinkedHashTreeMapTest { Node[] newTable = LinkedHashTreeMap.doubleCapacity(oldTable); assertTree("(b d f)", newTable[0]); // Even hash codes! - assertNull(newTable[1]); // Odd hash codes! + assertThat(newTable[1]).isNull(); for (Node node : newTable) { if (node != null) { @@ -251,7 +245,7 @@ public final class LinkedHashTreeMapTest { } private void assertTree(String expected, Node root) { - assertEquals(expected, toString(root)); + assertThat(toString(root)).isEqualTo(expected); assertConsistent(root); } @@ -259,17 +253,17 @@ public final class LinkedHashTreeMapTest { int leftHeight = 0; if (node.left != null) { assertConsistent(node.left); - assertSame(node, node.left.parent); + assertThat(node.left.parent).isSameAs(node); leftHeight = node.left.height; } int rightHeight = 0; if (node.right != null) { assertConsistent(node.right); - assertSame(node, node.right.parent); + assertThat(node.right.parent).isSameAs(node); rightHeight = node.right.height; } if (node.parent != null) { - assertTrue(node.parent.left == node || node.parent.right == node); + assertThat(node.parent.left == node || node.parent.right == node).isTrue(); } if (Math.max(leftHeight, rightHeight) + 1 != node.height) { fail(); @@ -285,12 +279,4 @@ public final class LinkedHashTreeMapTest { return String.format("(%s %s %s)", toString(root.left), root.key, toString(root.right)); } } - - private void assertIterationOrder(Iterable actual, T... expected) { - ArrayList actualList = new ArrayList<>(); - for (T t : actual) { - actualList.add(t); - } - assertEquals(Arrays.asList(expected), actualList); - } } diff --git a/moshi/src/test/java/com/squareup/moshi/MoshiTest.java b/moshi/src/test/java/com/squareup/moshi/MoshiTest.java index d46e93b..8d20eed 100644 --- a/moshi/src/test/java/com/squareup/moshi/MoshiTest.java +++ b/moshi/src/test/java/com/squareup/moshi/MoshiTest.java @@ -32,7 +32,6 @@ import org.junit.Test; import static com.squareup.moshi.TestUtil.newReader; import static java.lang.annotation.RetentionPolicy.RUNTIME; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; public final class MoshiTest { @@ -52,7 +51,7 @@ public final class MoshiTest { adapter.fromJson("null"); fail(); } catch (IllegalStateException expected) { - assertThat(expected.getMessage()).isEqualTo("Expected a boolean but was NULL at path $"); + assertThat(expected).hasMessage("Expected a boolean but was NULL at path $"); } try { @@ -95,14 +94,14 @@ public final class MoshiTest { adapter.fromJson("256"); fail(); } catch (NumberFormatException expected) { - assertThat(expected.getMessage()).isEqualTo("Expected a byte but was 256 at path $"); + assertThat(expected).hasMessage("Expected a byte but was 256 at path $"); } try { adapter.fromJson("-129"); fail(); } catch (NumberFormatException expected) { - assertThat(expected.getMessage()).isEqualTo("Expected a byte but was -129 at path $"); + assertThat(expected).hasMessage("Expected a byte but was -129 at path $"); } // Nulls not allowed for byte.class @@ -110,7 +109,7 @@ public final class MoshiTest { adapter.fromJson("null"); fail(); } catch (IllegalStateException expected) { - assertThat(expected.getMessage()).isEqualTo("Expected an int but was NULL at path $"); + assertThat(expected).hasMessage("Expected an int but was NULL at path $"); } try { @@ -191,7 +190,7 @@ public final class MoshiTest { adapter.fromJson("'ab'"); fail(); } catch (IllegalStateException expected) { - assertThat(expected.getMessage()).isEqualTo("Expected a char but was \"ab\" at path $"); + assertThat(expected).hasMessage("Expected a char but was \"ab\" at path $"); } // Nulls not allowed for char.class @@ -199,7 +198,7 @@ public final class MoshiTest { adapter.fromJson("null"); fail(); } catch (IllegalStateException expected) { - assertThat(expected.getMessage()).isEqualTo("Expected a string but was NULL at path $"); + assertThat(expected).hasMessage("Expected a string but was NULL at path $"); } try { @@ -221,7 +220,7 @@ public final class MoshiTest { adapter.fromJson("'ab'"); fail(); } catch (IllegalStateException expected) { - assertThat(expected.getMessage()).isEqualTo("Expected a char but was \"ab\" at path $"); + assertThat(expected).hasMessage("Expected a char but was \"ab\" at path $"); } // Allow nulls for Character.class @@ -255,7 +254,7 @@ public final class MoshiTest { adapter.fromJson("null"); fail(); } catch (IllegalStateException expected) { - assertThat(expected.getMessage()).isEqualTo("Expected a double but was NULL at path $"); + assertThat(expected).hasMessage("Expected a double but was NULL at path $"); } try { @@ -272,7 +271,7 @@ public final class MoshiTest { adapter.fromJson(reader); fail(); } catch (NumberFormatException expected) { - assertThat(expected.getMessage()).isEqualTo("JSON forbids NaN and infinities: Infinity at path $[0]"); + assertThat(expected).hasMessage("JSON forbids NaN and infinities: Infinity at path $[0]"); } reader = newReader("[-1E309]"); @@ -281,7 +280,7 @@ public final class MoshiTest { adapter.fromJson(reader); fail(); } catch (NumberFormatException expected) { - assertThat(expected.getMessage()).isEqualTo("JSON forbids NaN and infinities: -Infinity at path $[0]"); + assertThat(expected).hasMessage("JSON forbids NaN and infinities: -Infinity at path $[0]"); } } @@ -323,7 +322,7 @@ public final class MoshiTest { adapter.fromJson("null"); fail(); } catch (IllegalStateException expected) { - assertThat(expected.getMessage()).isEqualTo("Expected a double but was NULL at path $"); + assertThat(expected).hasMessage("Expected a double but was NULL at path $"); } try { @@ -340,7 +339,7 @@ public final class MoshiTest { adapter.fromJson(reader); fail(); } catch (NumberFormatException expected) { - assertThat(expected.getMessage()).isEqualTo("JSON forbids NaN and infinities: Infinity at path $[1]"); + assertThat(expected).hasMessage("JSON forbids NaN and infinities: Infinity at path $[1]"); } reader = newReader("[-1E39]"); @@ -349,7 +348,7 @@ public final class MoshiTest { adapter.fromJson(reader); fail(); } catch (NumberFormatException expected) { - assertThat(expected.getMessage()).isEqualTo("JSON forbids NaN and infinities: -Infinity at path $[1]"); + assertThat(expected).hasMessage("JSON forbids NaN and infinities: -Infinity at path $[1]"); } } @@ -381,14 +380,14 @@ public final class MoshiTest { adapter.fromJson("2147483648"); fail(); } catch (NumberFormatException expected) { - assertThat(expected.getMessage()).isEqualTo("Expected an int but was 2147483648 at path $"); + assertThat(expected).hasMessage("Expected an int but was 2147483648 at path $"); } try { adapter.fromJson("-2147483649"); fail(); } catch (NumberFormatException expected) { - assertThat(expected.getMessage()).isEqualTo("Expected an int but was -2147483649 at path $"); + assertThat(expected).hasMessage("Expected an int but was -2147483649 at path $"); } // Nulls not allowed for int.class @@ -396,7 +395,7 @@ public final class MoshiTest { adapter.fromJson("null"); fail(); } catch (IllegalStateException expected) { - assertThat(expected.getMessage()).isEqualTo("Expected an int but was NULL at path $"); + assertThat(expected).hasMessage("Expected an int but was NULL at path $"); } try { @@ -434,14 +433,14 @@ public final class MoshiTest { // adapter.fromJson("9223372036854775808"); // fail(); //} catch (NumberFormatException expected) { - // assertThat(expected.getMessage()).isEqualTo("Expected a long but was 9223372036854775808 at path $"); + // assertThat(expected).hasMessage("Expected a long but was 9223372036854775808 at path $"); //} // //try { // adapter.fromJson("-9223372036854775809"); // fail(); //} catch (NumberFormatException expected) { - // assertThat(expected.getMessage()).isEqualTo("Expected a long but was -9223372036854775809 at path $"); + // assertThat(expected).hasMessage("Expected a long but was -9223372036854775809 at path $"); //} // Nulls not allowed for long.class @@ -449,7 +448,7 @@ public final class MoshiTest { adapter.fromJson("null"); fail(); } catch (IllegalStateException expected) { - assertThat(expected.getMessage()).isEqualTo("Expected a long but was NULL at path $"); + assertThat(expected).hasMessage("Expected a long but was NULL at path $"); } try { @@ -485,14 +484,14 @@ public final class MoshiTest { adapter.fromJson("32768"); fail(); } catch (NumberFormatException expected) { - assertThat(expected.getMessage()).isEqualTo("Expected a short but was 32768 at path $"); + assertThat(expected).hasMessage("Expected a short but was 32768 at path $"); } try { adapter.fromJson("-32769"); fail(); } catch (NumberFormatException expected) { - assertThat(expected.getMessage()).isEqualTo("Expected a short but was -32769 at path $"); + assertThat(expected).hasMessage("Expected a short but was -32769 at path $"); } // Nulls not allowed for short.class @@ -500,7 +499,7 @@ public final class MoshiTest { adapter.fromJson("null"); fail(); } catch (IllegalStateException expected) { - assertThat(expected.getMessage()).isEqualTo("Expected an int but was NULL at path $"); + assertThat(expected).hasMessage("Expected an int but was NULL at path $"); } try { @@ -645,8 +644,8 @@ public final class MoshiTest { Util.jsonAnnotations(uppercaseStringsField)); fail(); } catch (IllegalArgumentException expected) { - assertEquals("no JsonAdapter for java.util.List annotated " - + "[@com.squareup.moshi.MoshiTest$Uppercase()]", expected.getMessage()); + assertThat(expected).hasMessage( "no JsonAdapter for java.util.List " + + "annotated [@com.squareup.moshi.MoshiTest$Uppercase()]"); } } @@ -678,8 +677,8 @@ public final class MoshiTest { adapter.fromJson("\"SPOCK\""); fail(); } catch (IllegalStateException expected) { - assertThat(expected.getMessage()) - .isEqualTo("Expected one of [ROCK, PAPER, SCISSORS] but was SPOCK at path $"); + assertThat(expected).hasMessage( + "Expected one of [ROCK, PAPER, SCISSORS] but was SPOCK at path $"); } } diff --git a/moshi/src/test/java/com/squareup/moshi/TypesTest.java b/moshi/src/test/java/com/squareup/moshi/TypesTest.java index 74f84c2..fd77e27 100644 --- a/moshi/src/test/java/com/squareup/moshi/TypesTest.java +++ b/moshi/src/test/java/com/squareup/moshi/TypesTest.java @@ -24,7 +24,6 @@ import java.util.Properties; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; public final class TypesTest { @@ -53,7 +52,7 @@ public final class TypesTest { } @Test public void getFirstTypeArgument() throws Exception { - assertNull(getFirstTypeArgument(A.class)); + assertThat(getFirstTypeArgument(A.class)).isNull(); Type type = Types.newParameterizedType(A.class, B.class, C.class); assertThat(getFirstTypeArgument(type)).isEqualTo(B.class);