Clean up post #3655 (to keep tests compiling with J3 too)

Author: cowtowncoder

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

@@ -357,19 +357,21 @@ public void testPropertyCreatorEnum3280() throws Exception
     // for [databind#3655]
     public void testEnumsFromIntsUnwrapped() throws Exception
     {
-        Object ob = newJsonMapper()
-                .enable(DeserializationFeature.UNWRAP_SINGLE_VALUE_ARRAYS)
-                .readValue("[1]", TestEnumFromInt.class);
+        Object ob = MAPPER
+                .readerFor(TestEnumFromInt.class)
+                .with(DeserializationFeature.UNWRAP_SINGLE_VALUE_ARRAYS)
+                .readValue("[1]");
         assertEquals(TestEnumFromInt.class, ob.getClass());
         assertSame(TestEnumFromInt.ENUM_A, ob);
     }
 
     // for [databind#3655]
     public void testEnumsFromStringUnwrapped() throws Exception
     {
-        Object ob = newJsonMapper()
-                .enable(DeserializationFeature.UNWRAP_SINGLE_VALUE_ARRAYS)
-                .readValue("[\"ENUM_A\"]", TestEnumFromString.class);
+        Object ob = MAPPER
+                .readerFor(TestEnumFromString.class)
+                .with(DeserializationFeature.UNWRAP_SINGLE_VALUE_ARRAYS)
+                .readValue("[\"ENUM_A\"]");
         assertEquals(TestEnumFromString.class, ob.getClass());
         assertSame(TestEnumFromString.ENUM_A, ob);
     }

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

@@ -207,10 +207,10 @@ public void testDeserializationFromString() throws Exception {
     }
 
     public void testDeserializationFromWrappedString() throws Exception {
-        assertEquals("DELEG:testProduct",
-                newJsonMapper()
-                        .enable(DeserializationFeature.UNWRAP_SINGLE_VALUE_ARRAYS)
-                        .readValue("[\"testProduct\"]", Product1853.class).getName());
+        Product1853 result = MAPPER.readerFor(Product1853.class)
+                .with(DeserializationFeature.UNWRAP_SINGLE_VALUE_ARRAYS)
+                .readValue("[\"testProduct\"]");
+        assertEquals("DELEG:testProduct", result.getName());
     }
 }