Clarify delegation with qualifiers test. (#359)

This commit is contained in:
Eric Cochran
2017-10-04 16:49:23 -07:00
committed by GitHub
parent f847d47daa
commit 4376a50f1f

View File

@@ -98,7 +98,7 @@ public final class AdapterMethodsTest {
} }
private static final class PointJsonAdapterWithDelegateWithQualifier { private static final class PointJsonAdapterWithDelegateWithQualifier {
@FromJson @WithParens Point fromJson(JsonReader reader, JsonAdapter<Point> delegate) @FromJson @WithParens Point fromJson(JsonReader reader, @WithParens JsonAdapter<Point> delegate)
throws IOException { throws IOException {
reader.beginArray(); reader.beginArray();
Point value = delegate.fromJson(reader); Point value = delegate.fromJson(reader);
@@ -106,7 +106,8 @@ public final class AdapterMethodsTest {
return value; return value;
} }
@ToJson void toJson(JsonWriter writer, @WithParens Point value, JsonAdapter<Point> delegate) @ToJson void toJson(JsonWriter writer, @WithParens Point value,
@WithParens JsonAdapter<Point> delegate)
throws IOException { throws IOException {
writer.beginArray(); writer.beginArray();
delegate.toJson(writer, value); delegate.toJson(writer, value);
@@ -115,7 +116,9 @@ public final class AdapterMethodsTest {
} }
@Test public void toAndFromWithDelegate() throws Exception { @Test public void toAndFromWithDelegate() throws Exception {
Moshi moshi = new Moshi.Builder().add(new PointJsonAdapterWithDelegate()).build(); Moshi moshi = new Moshi.Builder()
.add(new PointJsonAdapterWithDelegate())
.build();
JsonAdapter<Point> adapter = moshi.adapter(Point.class); JsonAdapter<Point> adapter = moshi.adapter(Point.class);
Point point = new Point(5, 8); Point point = new Point(5, 8);
assertThat(adapter.toJson(point)).isEqualTo("[{\"x\":5,\"y\":8}]"); assertThat(adapter.toJson(point)).isEqualTo("[{\"x\":5,\"y\":8}]");
@@ -123,11 +126,14 @@ public final class AdapterMethodsTest {
} }
@Test public void toAndFromWithDelegateWithQualifier() throws Exception { @Test public void toAndFromWithDelegateWithQualifier() throws Exception {
Moshi moshi = new Moshi.Builder().add(new PointJsonAdapterWithDelegateWithQualifier()).build(); Moshi moshi = new Moshi.Builder()
.add(new PointJsonAdapterWithDelegateWithQualifier())
.add(new PointWithParensJsonAdapter())
.build();
JsonAdapter<Point> adapter = moshi.adapter(Point.class, WithParens.class); JsonAdapter<Point> adapter = moshi.adapter(Point.class, WithParens.class);
Point point = new Point(5, 8); Point point = new Point(5, 8);
assertThat(adapter.toJson(point)).isEqualTo("[{\"x\":5,\"y\":8}]"); assertThat(adapter.toJson(point)).isEqualTo("[\"(5 8)\"]");
assertThat(adapter.fromJson("[{\"x\":5,\"y\":8}]")).isEqualTo(point); assertThat(adapter.fromJson("[\"(5 8)\"]")).isEqualTo(point);
} }
@Test public void toJsonOnly() throws Exception { @Test public void toJsonOnly() throws Exception {