...

Author: cowtowncoder

afterburner/src/test/java/com/fasterxml/jackson/module/afterburner/AfterburnerTestBase.java

@@ -151,6 +151,11 @@ protected static JsonMapper newObjectMapper() {
         return mapperBuilder().build();
     }
 
+    // preferred in 3.0:
+    protected static JsonMapper newAfterburnerMapper() {
+        return mapperBuilder().build();
+    }
+
     protected static JsonMapper.Builder mapperBuilder() {
         return JsonMapper.builder()
                 .addModule(new AfterburnerModule());
@@ -182,7 +187,7 @@ protected void assertToken(JsonToken expToken, JsonToken actToken)
 
     protected void assertToken(JsonToken expToken, JsonParser jp)
     {
-        assertToken(expToken, jp.getCurrentToken());
+        assertToken(expToken, jp.currentToken());
     }
 
     protected void assertType(Object ob, Class<?> expType)
@@ -211,7 +216,7 @@ protected String getAndVerifyText(JsonParser jp)
         String str = jp.getText();
 
         if (str.length() !=  actLen) {
-            fail("Internal problem (jp.token == "+jp.getCurrentToken()+"): jp.getText().length() ['"+str+"'] == "+str.length()+"; jp.getTextLength() == "+actLen);
+            fail("Internal problem (jp.token == "+jp.currentToken()+"): jp.getText().length() ['"+str+"'] == "+str.length()+"; jp.getTextLength() == "+actLen);
         }
         assertEquals("String access via getText(), getTextXxx() must be the same", str, str2);
 
@@ -222,7 +227,7 @@ protected void verifyFieldName(JsonParser jp, String expName)
         throws IOException
     {
         assertEquals(expName, jp.getText());
-        assertEquals(expName, jp.getCurrentName());
+        assertEquals(expName, jp.currentName());
     }
 
     protected void verifyIntValue(JsonParser jp, long expValue)

osgi/src/test/java/com/fasterxml/jackson/module/osgi/InjectOsgiServiceTest.java

@@ -30,6 +30,7 @@
 
 import com.fasterxml.jackson.annotation.JacksonInject;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.json.JsonMapper;
 
 @RunWith(value = Parameterized.class)
 public class InjectOsgiServiceTest
@@ -64,8 +65,9 @@ public void setUp() throws Exception
         when(bundleContext.getServiceReferences(eq(Service.class.getName()), anyString())).thenReturn(new ServiceReference[]{mock(ServiceReference.class)});
         when(bundleContext.getService(any(ServiceReference.class))).thenReturn(mock(Service.class));
 
-        mapper = new ObjectMapper();
-        mapper.registerModule(new OsgiJacksonModule(bundleContext));
+        mapper = JsonMapper.builder()
+                .addModule(new OsgiJacksonModule(bundleContext))
+                .build();
     }
 
     @Test