Merge tag 'gson-2.4' into cm-13.0HEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001staging/lineage-15.1stable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kstable/cm-13.0-ZNH0Ecm-14.1cm-14.0cm-13.0

[maven-release-plugin]  copy for tag gson-2.4

Change-Id: Id89b6397c7e9152eaab6f4753826708330d7373c

1 files changed, 149 insertions, 0 deletions

diff --git a/gson/src/test/java/com/google/gson/functional/TypeAdapterPrecedenceTest.java b/gson/src/test/java/com/google/gson/functional/TypeAdapterPrecedenceTest.java
new file mode 100644
index 00000000..2f13f664
--- /dev/null
+++ b/gson/src/test/java/com/google/gson/functional/TypeAdapterPrecedenceTest.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright (C) 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.gson.functional;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+import java.lang.reflect.Type;
+import junit.framework.TestCase;
+
+public final class TypeAdapterPrecedenceTest extends TestCase {
+  public void testNonstreamingFollowedByNonstreaming() {
+    Gson gson = new GsonBuilder()
+        .registerTypeAdapter(Foo.class, newSerializer("serializer 1"))
+        .registerTypeAdapter(Foo.class, newSerializer("serializer 2"))
+        .registerTypeAdapter(Foo.class, newDeserializer("deserializer 1"))
+        .registerTypeAdapter(Foo.class, newDeserializer("deserializer 2"))
+        .create();
+    assertEquals("\"foo via serializer 2\"", gson.toJson(new Foo("foo")));
+    assertEquals("foo via deserializer 2", gson.fromJson("foo", Foo.class).name);
+  }
+
+  public void testStreamingFollowedByStreaming() {
+    Gson gson = new GsonBuilder()
+        .registerTypeAdapter(Foo.class, newTypeAdapter("type adapter 1"))
+        .registerTypeAdapter(Foo.class, newTypeAdapter("type adapter 2"))
+        .create();
+    assertEquals("\"foo via type adapter 2\"", gson.toJson(new Foo("foo")));
+    assertEquals("foo via type adapter 2", gson.fromJson("foo", Foo.class).name);
+  }
+
+  public void testSerializeNonstreamingTypeAdapterFollowedByStreamingTypeAdapter() {
+    Gson gson = new GsonBuilder()
+        .registerTypeAdapter(Foo.class, newSerializer("serializer"))
+        .registerTypeAdapter(Foo.class, newDeserializer("deserializer"))
+        .registerTypeAdapter(Foo.class, newTypeAdapter("type adapter"))
+        .create();
+    assertEquals("\"foo via type adapter\"", gson.toJson(new Foo("foo")));
+    assertEquals("foo via type adapter", gson.fromJson("foo", Foo.class).name);
+  }
+
+  public void testStreamingFollowedByNonstreaming() {
+    Gson gson = new GsonBuilder()
+        .registerTypeAdapter(Foo.class, newTypeAdapter("type adapter"))
+        .registerTypeAdapter(Foo.class, newSerializer("serializer"))
+        .registerTypeAdapter(Foo.class, newDeserializer("deserializer"))
+        .create();
+    assertEquals("\"foo via serializer\"", gson.toJson(new Foo("foo")));
+    assertEquals("foo via deserializer", gson.fromJson("foo", Foo.class).name);
+  }
+
+  public void testStreamingHierarchicalFollowedByNonstreaming() {
+    Gson gson = new GsonBuilder()
+        .registerTypeHierarchyAdapter(Foo.class, newTypeAdapter("type adapter"))
+        .registerTypeAdapter(Foo.class, newSerializer("serializer"))
+        .registerTypeAdapter(Foo.class, newDeserializer("deserializer"))
+        .create();
+    assertEquals("\"foo via serializer\"", gson.toJson(new Foo("foo")));
+    assertEquals("foo via deserializer", gson.fromJson("foo", Foo.class).name);
+  }
+
+  public void testStreamingFollowedByNonstreamingHierarchical() {
+    Gson gson = new GsonBuilder()
+        .registerTypeAdapter(Foo.class, newTypeAdapter("type adapter"))
+        .registerTypeHierarchyAdapter(Foo.class, newSerializer("serializer"))
+        .registerTypeHierarchyAdapter(Foo.class, newDeserializer("deserializer"))
+        .create();
+    assertEquals("\"foo via type adapter\"", gson.toJson(new Foo("foo")));
+    assertEquals("foo via type adapter", gson.fromJson("foo", Foo.class).name);
+  }
+
+  public void testStreamingHierarchicalFollowedByNonstreamingHierarchical() {
+    Gson gson = new GsonBuilder()
+        .registerTypeHierarchyAdapter(Foo.class, newSerializer("serializer"))
+        .registerTypeHierarchyAdapter(Foo.class, newDeserializer("deserializer"))
+        .registerTypeHierarchyAdapter(Foo.class, newTypeAdapter("type adapter"))
+        .create();
+    assertEquals("\"foo via type adapter\"", gson.toJson(new Foo("foo")));
+    assertEquals("foo via type adapter", gson.fromJson("foo", Foo.class).name);
+  }
+
+  public void testNonstreamingHierarchicalFollowedByNonstreaming() {
+    Gson gson = new GsonBuilder()
+        .registerTypeHierarchyAdapter(Foo.class, newSerializer("hierarchical"))
+        .registerTypeHierarchyAdapter(Foo.class, newDeserializer("hierarchical"))
+        .registerTypeAdapter(Foo.class, newSerializer("non hierarchical"))
+        .registerTypeAdapter(Foo.class, newDeserializer("non hierarchical"))
+        .create();
+    assertEquals("\"foo via non hierarchical\"", gson.toJson(new Foo("foo")));
+    assertEquals("foo via non hierarchical", gson.fromJson("foo", Foo.class).name);
+  }
+
+  private static class Foo {
+    final String name;
+    private Foo(String name) {
+      this.name = name;
+    }
+  }
+
+  private JsonSerializer<Foo> newSerializer(final String name) {
+    return new JsonSerializer<Foo>() {
+      public JsonElement serialize(Foo src, Type typeOfSrc, JsonSerializationContext context) {
+        return new JsonPrimitive(src.name + " via " + name);
+      }
+    };
+  }
+
+  private JsonDeserializer<Foo> newDeserializer(final String name) {
+    return new JsonDeserializer<Foo>() {
+      public Foo deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) {
+        return new Foo(json.getAsString() + " via " + name);
+      }
+    };
+  }
+
+  private TypeAdapter<Foo> newTypeAdapter(final String name) {
+    return new TypeAdapter<Foo>() {
+      @Override public Foo read(JsonReader in) throws IOException {
+        return new Foo(in.nextString() + " via " + name);
+      }
+      @Override public void write(JsonWriter out, Foo value) throws IOException {
+        out.value(value.name + " via " + name);
+      }
+    };
+  }
+}