More test fixes

Author: cowtowncoder

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

@@ -3,14 +3,13 @@
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import static com.fasterxml.jackson.databind.testutil.DatabindTestUtil.a2q;
-import static com.fasterxml.jackson.databind.testutil.DatabindTestUtil.newJsonMapper;
-
 // [databind#3234]
 public class CoerceEmptyToInt3234Test
+    extends DatabindTestUtil
 {
     static class BasicIntWrapper {
         public int value = 13;
@@ -24,7 +23,10 @@ static class BasicDoubleWrapper {
         public double value = -1.25;
     }
 
-    private final ObjectMapper MAPPER = newJsonMapper();
+    private final ObjectMapper MAPPER = jsonMapperBuilder()
+            // 08-Jan-2025, tatu: Need to allow null-to-int coercion for some tests
+            .disable(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES)
+            .build();
     private final ObjectReader READER_INT_BASIC = MAPPER.readerFor(BasicIntWrapper.class);
     private final ObjectReader READER_LONG_BASIC = MAPPER.readerFor(BasicLongWrapper.class);
     private final ObjectReader READER_DOUBLE_BASIC = MAPPER.readerFor(BasicDoubleWrapper.class);

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

@@ -86,6 +86,8 @@ private void _verifyNullOkFromEmpty(Class<?> type, Object exp) throws IOExceptio
     {
         Object result = COERCING_MAPPER.readerFor(type)
                 .with(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT)
+                // 08-Jan-2025, tatu: Need to allow null-to-int coercion here
+                .without(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES)
                 .readValue("\"\"");
         if (exp == null) {
             assertNull(result);

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

@@ -34,6 +34,8 @@ public class CoerceStringToIntsTest
         .build();
 
     private final ObjectMapper MAPPER_TO_NULL = jsonMapperBuilder()
+            // 08-Jan-2025, tatu: Need to allow null-to-int coercion for some tests
+            .disable(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES)
             .withCoercionConfig(LogicalType.Integer, cfg ->
             cfg.setCoercion(CoercionInputShape.String, CoercionAction.AsNull))
         .build();

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

@@ -10,7 +10,10 @@
 
 public class ScalarConversionTest
 {
-    private final ObjectMapper MAPPER = newJsonMapper();
+    // 08-Jan-2025, tatu: Need to allow null-to-int coercion here
+    private final ObjectMapper MAPPER = jsonMapperBuilder()
+            .disable(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES)
+            .build();
 
     // [databind#1433]
     @Test