Moar test refactoring

Author: cowtowncoder

src/test/java/com/fasterxml/jackson/databind/jsontype/ext/ExternalTypeIdTest1288.java renamed to src/test/java/com/fasterxml/jackson/databind/jsontype/ext/ExternalTypeCustomResolverTest.java

@@ -13,8 +13,9 @@
 import com.fasterxml.jackson.databind.jsontype.impl.TypeIdResolverBase;
 
 @SuppressWarnings("hiding")
-public class ExternalTypeIdTest1288 extends BaseMapTest
+public class ExternalTypeCustomResolverTest extends BaseMapTest
 {
+    // [databind#1288]
     public static class ClassesWithoutBuilder {
 
         public static class CreditCardDetails implements PaymentDetails {
@@ -497,7 +498,8 @@ public Id getMechanism () {
         }
     }
 
-    public void testVisibleExternalTypeId1288() throws Exception
+    // [databind#1288]
+    public void testVisibleExternalTypeIdCustomResolver() throws Exception
     {
         // given
         final String asJson1 = "{\"form_of_payment\":\"INDIVIDUAL_CREDIT_CARD\", \"payment_details\":{\"card_holder_first_name\":\"John\", \"card_holder_last_name\":\"Doe\",  \"number\":\"XXXXXXXXXXXXXXXX\", \"expiry_date\":\"MM/YY\","

src/test/java/com/fasterxml/jackson/databind/jsontype/ext/ExternalTypeId999Test.java

@@ -1,14 +1,13 @@
 package com.fasterxml.jackson.databind.jsontype.ext;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-
+import com.fasterxml.jackson.annotation.*;
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.*;
 
-// [databind#1198]
 public class ExternalTypeIdWithCreatorTest extends BaseMapTest
 {
+    // [databind#1198]
+    
     public enum Attacks { KICK, PUNCH }
 
     static class Character {
@@ -47,8 +46,46 @@ public Punch(String side) {
         }
     }
 
-    final ObjectMapper MAPPER = new ObjectMapper();
+    // [databind#999]
+
+    public static interface Payload999 { }
+
+    @JsonTypeName("foo")
+    public static class FooPayload999 implements Payload999 { }
+
+    @JsonTypeName("bar")
+    public static class BarPayload999 implements Payload999 { }
+
+    public static class Message<P extends Payload999>
+    {
+        final String type;
+
+        @JsonTypeInfo(use = JsonTypeInfo.Id.NAME,
+                visible = true,
+                include = JsonTypeInfo.As.EXTERNAL_PROPERTY, property = "type")
+        @JsonSubTypes({
+                @JsonSubTypes.Type(FooPayload999.class),
+                @JsonSubTypes.Type(BarPayload999.class) })
+        private final P payload;
+
+        @JsonCreator
+        public Message(@JsonProperty("type") String type,
+                @JsonProperty("payload") P payload)
+        {
+            this.type = type;
+            this.payload = payload;
+        }
+    }
+    
+    /*
+    /********************************************************************** 
+    /* Test methods
+    /********************************************************************** 
+     */
+
+    private final ObjectMapper MAPPER = new ObjectMapper();
 
+    // [databind#1198]
     public void testFails() throws Exception {
         String json = "{ \"name\": \"foo\", \"attack\":\"right\" } }";
 
@@ -59,6 +96,7 @@ public void testFails() throws Exception {
         assertEquals("foo", character.name);
     }
 
+    // [databind#1198]
     public void testWorks() throws Exception {
         String json = "{ \"name\": \"foo\", \"preferredAttack\": \"KICK\", \"attack\":\"right\" } }";
 
@@ -68,4 +106,21 @@ public void testWorks() throws Exception {
         assertNotNull(character.attack);
         assertEquals("foo", character.name);
     }
+
+    // [databind#999]
+    public void testExternalTypeId() throws Exception
+    {
+        TypeReference<Message<FooPayload999>> type = new TypeReference<Message<FooPayload999>>() { };
+
+        Message<?> msg = MAPPER.readValue(aposToQuotes("{ 'type':'foo', 'payload': {} }"), type);
+        assertNotNull(msg);
+        assertNotNull(msg.payload);
+        assertEquals("foo", msg.type);
+
+        // and then with different order
+        msg = MAPPER.readValue(aposToQuotes("{'payload': {}, 'type':'foo' }"), type);
+        assertNotNull(msg);
+        assertNotNull(msg.payload);
+        assertEquals("foo", msg.type);
+    }
 }