minor refactoring of tests

Author: cowtowncoder

src/test/java/com/fasterxml/jackson/databind/creators/CreatorPropertiesTest.java

@@ -0,0 +1,41 @@
+package com.fasterxml.jackson.databind.creators;
+
+import java.beans.ConstructorProperties;
+
+import com.fasterxml.jackson.databind.*;
+
+public class CreatorPropertiesTest extends BaseMapTest
+{
+    static class Issue905Bean {
+        // 08-Nov-2015, tatu: Note that in real code we would most likely use same
+        //    names for properties; but here we use different name on purpose to
+        //    ensure that Jackson has no way of binding JSON properties "x" and "y"
+        //    using any other mechanism than via `@ConstructorProperties` annotation
+        public int _x, _y;
+
+        @ConstructorProperties({"x", "y"})
+        // Same as above; use differing local parameter names so that parameter name
+        // introspection can not be used as the source of property names.
+        public Issue905Bean(int a, int b) {
+            _x = a;
+            _y = b;
+        }
+    }
+    
+    /*
+    /**********************************************************
+    /* Test methods
+    /**********************************************************
+     */
+
+    private final ObjectMapper MAPPER = new ObjectMapper();
+
+    // [databind#905]
+    public void testCreatorPropertiesAnnotation() throws Exception
+    {
+        Issue905Bean b = MAPPER.readValue(aposToQuotes("{'y':3,'x':2}"),
+                Issue905Bean.class);
+        assertEquals(2, b._x);
+        assertEquals(3, b._y);
+    }
+}

src/test/java/com/fasterxml/jackson/databind/creators/TestCreators2.java

@@ -80,7 +80,6 @@ public BeanFor438(@JsonProperty("name") String s) {
         }
     }
 
-    // For [JACKSON-465]
     static class MapBean
     {
         protected Map<String,Long> map;
@@ -122,7 +121,6 @@ static class BustedCtor {
         }
     }
 
-    // As per [JACKSON-575]
     static class IgnoredCtor
     {
         @JsonIgnore
@@ -162,22 +160,6 @@ public Issue700Bean(@JsonProperty("item") String item) { }
         public String getItem() { return null; }
     }
 
-    static class Issue905Bean {
-        // 08-Nov-2015, tatu: Note that in real code we would most likely use same
-        //    names for properties; but here we use different name on purpose to
-        //    ensure that Jackson has no way of binding JSON properties "x" and "y"
-        //    using any other mechanism than via `@ConstructorProperties` annotation
-        public int _x, _y;
-
-        @ConstructorProperties({"x", "y"})
-        // Same as above; use differing local parameter names so that parameter name
-        // introspection can not be used as the source of property names.
-        public Issue905Bean(int a, int b) {
-            _x = a;
-            _y = b;
-        }
-    }
-
     /*
     /**********************************************************
     /* Test methods
@@ -313,13 +295,4 @@ public void testCreatorProperties() throws Exception
         Issue700Bean value = MAPPER.readValue("{ \"item\" : \"foo\" }", Issue700Bean.class);
         assertNotNull(value);
     }
-
-    // [databind#905]
-    public void testCreatorPropertiesAnnotation() throws Exception
-    {
-        Issue905Bean b = MAPPER.readValue(aposToQuotes("{'y':3,'x':2}"),
-                Issue905Bean.class);
-        assertEquals(2, b._x);
-        assertEquals(3, b._y);
-    }
 }

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

@@ -18,7 +18,7 @@ static class Bean1124
 
         public void addAdditionalProperty(String key, String value) {
             if (additionalProperties == null) {
-                additionalProperties = new HashMap<>();
+                additionalProperties = new HashMap<String,String>();
             }
             additionalProperties.put(key,value);
         }