Moar test proofing

Author: cowtowncoder

src/test/java/com/fasterxml/jackson/databind/SerializeUsingJDKTest.java

@@ -27,7 +27,7 @@ static class MyPojo {
         protected int y;
 
         public MyPojo() { }
-        public MyPojo(int x0, int y0) {
+        protected MyPojo(int x0, int y0) {
             x = x0;
             y = y0;
         }
@@ -48,7 +48,7 @@ static class AnyBean {
         HashMap<String,Object> _map;
 
         public AnyBean() {
-            _map = new HashMap<String,Object>();
+            _map = new HashMap<>();
         }
 
         @JsonAnySetter

src/test/java/com/fasterxml/jackson/databind/convert/BeanConversionsTest.java

@@ -31,7 +31,7 @@ static class PointZ {
         public int z = -13;
 
         public PointZ() { }
-        public PointZ(int a, int b, int c)
+        protected PointZ(int a, int b, int c)
         {
             x = a;
             y = b;

src/test/java/com/fasterxml/jackson/databind/deser/merge/PropertyMergeTest.java

@@ -30,7 +30,7 @@ static class Config {
         public AB loc = new AB(1, 2);
 
         protected Config() { }
-        public Config(int a, int b) {
+        protected Config(int a, int b) {
             loc = new AB(a, b);
         }
     }
@@ -52,7 +52,7 @@ static class AB {
         public int b;
 
         protected AB() { }
-        public AB(int a0, int b0) {
+        protected AB(int a0, int b0) {
             a = a0;
             b = b0;
         }

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

@@ -40,7 +40,7 @@ static class Apple extends Fruit
         public String type;
 
         private Apple() { super(null); }
-        public Apple(String name, int b) {
+        protected Apple(String name, int b) {
             super(name);
             seedCount = b;
             type = "apple";
@@ -55,7 +55,7 @@ static class Orange extends Fruit
         public String type;
 
         private Orange() { super(null); }
-        public Orange(String name, String c) {
+        protected Orange(String name, String c) {
             super(name);
             color = c;
             type = "orange";
@@ -90,7 +90,7 @@ static class Dog extends Animal
         public int boneCount;
 
         private Dog() { super(null); }
-        public Dog(String name, int b) {
+        protected Dog(String name, int b) {
             super(name);
             boneCount = b;
         }
@@ -107,7 +107,7 @@ static class Cat extends Animal
         public String furColor;
 
         private Cat() { super(null); }
-        public Cat(String name, String c) {
+        protected Cat(String name, String c) {
             super(name);
             furColor = c;
         }
@@ -143,7 +143,7 @@ static class Accord extends Car
         public int speakerCount;
 
         private Accord() { super(null); }
-        public Accord(String name, int b) {
+        protected Accord(String name, int b) {
             super(name);
             speakerCount = b;
         }
@@ -159,12 +159,12 @@ static class Camry extends Car
         public String exteriorColor;
 
         private Camry() { super(null); }
-        public Camry(String name, String c) {
+        protected Camry(String name, String c) {
             super(name);
             exteriorColor = c;
         }
 
-		public String getType() {
+        public String getType() {
         	return "camry";
         }
     }

src/test/java/com/fasterxml/jackson/databind/objectid/TestObjectIdDeserialization.java

@@ -93,7 +93,7 @@ static class IdentifiableCustom
         public IdentifiableCustom next;
 
         public IdentifiableCustom() { this(-1, 0); }
-        public IdentifiableCustom(int i, int v) {
+        protected IdentifiableCustom(int i, int v) {
             customId = i;
             value = v;
         }

src/test/java/com/fasterxml/jackson/databind/objectid/TestObjectIdSerialization.java

@@ -150,7 +150,7 @@ static class TreeNode
         public TreeNode child;
 
         public TreeNode() { }
-        public TreeNode(TreeNode p, int id, String name) {
+        protected TreeNode(TreeNode p, int id, String name) {
             parent = p;
             this.id = id;
             this.name = name;

src/test/java/com/fasterxml/jackson/databind/testutil/DatabindTestUtil.java

@@ -5,6 +5,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.*;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 import com.fasterxml.jackson.core.*;
@@ -278,6 +279,8 @@ public static class Point {
         public int x, y;
 
         protected Point() { } // for deser
+
+        @JsonIgnore
         public Point(int x, int y) {
             this.x = x;
             this.y = y;