minor simplifications for #1298 test

Author: cowtowncoder

src/test/java/com/fasterxml/jackson/databind/jsontype/TestSubtypes.java

@@ -133,16 +133,25 @@ public Default1125(int a0, int b0, int def0) {
     		def = def0;
     	}
     }
-    
+
+    // [databind#1311]
+    @JsonTypeInfo(property = "type", use = JsonTypeInfo.Id.NAME, defaultImpl = Factory1311ImplA.class)
+    interface Factory1311 { }
+
+    @JsonTypeName("implA")
+    static class Factory1311ImplA implements Factory1311 { }
+
+    @JsonTypeName("implB")
+    static class Factory1311ImplB implements Factory1311 { }
+
     /*
     /**********************************************************
     /* Unit tests
     /**********************************************************
      */
 
     private final ObjectMapper MAPPER = new ObjectMapper();
-    
-    // JACKSON-510
+
     public void testPropertyWithSubtypes() throws Exception
     {
         ObjectMapper mapper = new ObjectMapper();
@@ -325,4 +334,14 @@ public void testIssue1125WithDefault() throws Exception
         assertEquals(5, impl.b);
         assertEquals(9, impl.def);
     }
+
+    // [databind#1311]
+    public void testSubtypeAssignmentCheck() throws Exception
+    {
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.registerSubtypes(Factory1311ImplA.class, Factory1311ImplB.class);
+        Factory1311ImplB result = mapper.readValue("{\"type\":\"implB\"}", Factory1311ImplB.class);
+        assertNotNull(result);
+        assertEquals(Factory1311ImplB.class, result.getClass());
+    }
 }

src/test/java/com/fasterxml/jackson/failing/TestObjectIdWithUnwrapping1298.java

@@ -0,0 +1,85 @@
+package com.fasterxml.jackson.failing;
+
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.*;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.BaseMapTest;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+// Test case for https://github.com/FasterXML/jackson-databind/issues/1298
+public class TestObjectIdWithUnwrapping1298 extends BaseMapTest
+{
+    private static Long nextId = 1L;
+
+    public static final class ListOfParents{
+        @JsonUnwrapped
+        public List<Parent> parents = new ArrayList<>();
+
+        public void addParent( Parent parent) { parents.add(parent);}
+    }
+
+    @JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class, property = "id", scope = Parent.class)
+    public static final class Parent {
+        public Long id;
+
+        @JsonUnwrapped
+        public Child child;
+        public Parent() { this.id = nextId++;}
+    }
+
+    @JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class, property = "id", scope = Child.class)
+    public static final class Child {
+
+        public Long id;
+
+        @JsonProperty
+        private final String name;
+
+        public Child(@JsonProperty("name") String name) {
+            this.name = name;
+            this.id = TestObjectIdWithUnwrapping1298.nextId++;
+        }
+    }
+
+    public void testObjectIdWithRepeatedChild() throws Exception
+    {
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.disable(JsonGenerator.Feature.AUTO_CLOSE_JSON_CONTENT);
+
+        // Equivalent to Spring _embedded for Bean w/ List property
+        ListOfParents parents = new ListOfParents();
+
+        //Bean with Relationship
+        Parent parent1 = new Parent();
+        Child child1 = new Child("Child1");
+        parent1.child = child1;
+        parents.addParent(parent1);
+
+        // serialize parent1 and parent2
+        String json = mapper
+//                .writerWithDefaultPrettyPrinter()
+                .writeValueAsString(parents);
+        System.out.println("This works: " + json);
+
+        // Add parent3 to create ObjectId reference
+        // Bean w/ repeated relationship from parent1, should generate ObjectId
+        Parent parent3 = new Parent();
+        parent3.child = child1;
+        parents.addParent(parent3);
+        StringWriter sw = new StringWriter();
+
+        try {
+            mapper
+//                .writerWithDefaultPrettyPrinter()
+                .writeValue(sw, parents);
+        } catch (Exception e) {
+            System.out.println("Failed output so far: " + json);
+            throw e;
+        }
+
+//        System.out.println("Also works: " + sw);
+    }
+}