Yet more test fixes

Author: cowtowncoder

src/test/java/com/fasterxml/jackson/databind/deser/creators/BigCreatorTest.java

@@ -50,7 +50,9 @@ public Biggie(
         }
     }
 
-    private final ObjectReader BIGGIE_READER = sharedMapper().readerFor(Biggie.class);
+    private final ObjectReader BIGGIE_READER = sharedMapper()
+            .readerFor(Biggie.class)
+            .without(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES);
 
     @Test
     public void testBigPartial() throws Exception

src/test/java/com/fasterxml/jackson/databind/deser/creators/FailOnNullCreatorTest.java

@@ -9,6 +9,7 @@
 import com.fasterxml.jackson.databind.exc.MismatchedInputException;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.fail;
 
 import static com.fasterxml.jackson.databind.testutil.DatabindTestUtil.*;
@@ -25,7 +26,7 @@ static class Person {
 
         @JsonCreator
         public Person(@JsonProperty(value="name") String name,
-                      @JsonProperty(value="age") int age)
+                      @JsonProperty(value="age") Integer age)
         {
             this.name = name;
             this.age = age;
@@ -41,13 +42,13 @@ public void testRequiredNonNullParam() throws Exception
         // First: fine if feature is not enabled
         p = POINT_READER.readValue(a2q("{}"));
         assertEquals(null, p.name);
-        assertEquals(Integer.valueOf(0), p.age);
+        assertNull(p.age);
 
         // Second: fine if feature is enabled but default value is not null
         ObjectReader r = POINT_READER.with(DeserializationFeature.FAIL_ON_NULL_CREATOR_PROPERTIES);
         p = POINT_READER.readValue(a2q("{'name':'John', 'age': null}"));
         assertEquals("John", p.name);
-        assertEquals(Integer.valueOf(0), p.age);
+        assertNull(p.age);
 
         // Third: throws exception if property is missing
         try {

src/test/java/com/fasterxml/jackson/databind/deser/creators/RequiredCreatorTest.java

@@ -8,18 +8,19 @@
 import com.fasterxml.jackson.databind.exc.MismatchedInputException;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.fail;
 
 import static com.fasterxml.jackson.databind.testutil.DatabindTestUtil.*;
 
 public class RequiredCreatorTest
 {
     static class FascistPoint {
-        int x, y;
+        Integer x, y;
 
         @JsonCreator
-        public FascistPoint(@JsonProperty(value="x", required=true) int x,
-                @JsonProperty(value="y", required=false) int y)
+        public FascistPoint(@JsonProperty(value="x", required=true) Integer x,
+                @JsonProperty(value="y", required=false) Integer y)
         {
             this.x = x;
             this.y = y;
@@ -81,7 +82,7 @@ public void testRequiredAnnotatedParam() throws Exception
         // also fine if 'y' is MIA
         p = POINT_READER.readValue(a2q("{'x':3}"));
         assertEquals(3, p.x);
-        assertEquals(0, p.y);
+        assertNull(p.y);
 
         // but not so good if 'x' missing
         try {
@@ -100,7 +101,7 @@ public void testRequiredGloballyParam() throws Exception
         // as per above, ok to miss 'y' with default settings:
         p = POINT_READER.readValue(a2q("{'x':2}"));
         assertEquals(2, p.x);
-        assertEquals(0, p.y);
+        assertNull(p.y);
 
         // but not if global checks desired
         ObjectReader r = POINT_READER.with(DeserializationFeature.FAIL_ON_MISSING_CREATOR_PROPERTIES);

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

@@ -15,13 +15,12 @@
 import com.fasterxml.jackson.databind.exc.InvalidDefinitionException;
 import com.fasterxml.jackson.databind.exc.MismatchedInputException;
 import com.fasterxml.jackson.databind.exc.ValueInstantiationException;
+import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import static com.fasterxml.jackson.databind.testutil.DatabindTestUtil.q;
-import static com.fasterxml.jackson.databind.testutil.DatabindTestUtil.verifyException;
-
 public class TestCreators2
+    extends DatabindTestUtil
 {
     static class HashTest
     {
@@ -259,7 +258,10 @@ public void testSimpleConstructor() throws Exception
     @Test
     public void testMissingPrimitives() throws Exception
     {
-        Primitives p = MAPPER.readValue("{}", Primitives.class);
+        Primitives p = MAPPER
+                .readerFor(Primitives.class)
+                .without(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES)
+                .readValue("{}");
         assertFalse(p.b);
         assertEquals(0, p.x);
         assertEquals(0.0, p.d);