Bit of test refactoring

Author: cowtowncoder

properties/src/test/java/com/fasterxml/jackson/dataformat/javaprop/ArrayGenerationTest.java

@@ -7,7 +7,7 @@
 
 public class ArrayGenerationTest extends ModuleTestBase
 {
-    private final JavaPropsMapper MAPPER = newObjectMapper();
+    private final JavaPropsMapper MAPPER = newPropertiesMapper();
 
     public void testPointListSimple() throws Exception
     {

properties/src/test/java/com/fasterxml/jackson/dataformat/javaprop/ArrayParsingTest.java

@@ -55,7 +55,7 @@ static class StringArrayWrapper {
     /**********************************************************************
      */
 
-    private final ObjectMapper MAPPER = newObjectMapper();
+    private final ObjectMapper MAPPER = newPropertiesMapper();
 
     public void testArrayWithBranch() throws Exception
     {

properties/src/test/java/com/fasterxml/jackson/dataformat/javaprop/BinaryParsingTest.java

@@ -28,7 +28,7 @@ public MyBean(boolean bogus) {
     /**********************************************************************
      */
 
-    private final JavaPropsMapper MAPPER = newObjectMapper();
+    private final JavaPropsMapper MAPPER = newPropertiesMapper();
 
     // [dataformats-text#74]
     public void testMultipleBinaryFields() throws Exception

properties/src/test/java/com/fasterxml/jackson/dataformat/javaprop/CustomSeparatorsTest.java

@@ -4,7 +4,7 @@
 
 public class CustomSeparatorsTest extends ModuleTestBase
 {
-    private final ObjectMapper MAPPER = newObjectMapper();
+    private final ObjectMapper MAPPER = newPropertiesMapper();
 
     public void testCustomPathSeparator() throws Exception
     {

properties/src/test/java/com/fasterxml/jackson/dataformat/javaprop/DefaultConfigsTest.java

@@ -13,7 +13,7 @@ public class DefaultConfigsTest extends ModuleTestBase
 
     public void testMapperBaseConfig()
     {
-        JavaPropsMapper mapper = newObjectMapper();
+        JavaPropsMapper mapper = newPropertiesMapper();
         _verifyVersion(mapper);
         JavaPropsMapper copy = mapper.copy();
         assertNotSame(mapper, copy);

properties/src/test/java/com/fasterxml/jackson/dataformat/javaprop/GenerationEscapingTest.java

@@ -6,7 +6,7 @@
 
 public class GenerationEscapingTest extends ModuleTestBase
 {
-    private final ObjectMapper MAPPER = newObjectMapper();
+    private final ObjectMapper MAPPER = newPropertiesMapper();
 
     public void testKeyEscaping() throws Exception
     {

properties/src/test/java/com/fasterxml/jackson/dataformat/javaprop/MapParsingTest.java

@@ -10,7 +10,7 @@ static class MapWrapper {
         public Map<String,String> map;
     }
 
-    private final ObjectMapper MAPPER = newObjectMapper();
+    private final ObjectMapper MAPPER = newPropertiesMapper();
 
     /*
     /**********************************************************************

properties/src/test/java/com/fasterxml/jackson/dataformat/javaprop/ModuleTestBase.java

@@ -127,27 +127,22 @@ protected ModuleTestBase() { }
     /**********************************************************************
      */
 
-    protected JavaPropsFactoryBuilder streamFactoryBuilder() {
+    protected JavaPropsFactoryBuilder propertiesFactoryBuilder() {
         return JavaPropsFactory.builder();
     }
 
-    @Deprecated
-    protected JavaPropsMapper mapperForProps() {
-        return mapperBuilder().build();
+    protected JavaPropsMapper newPropertiesMapper() {
+        return propertiesMapperBuilder().build();
     }
-
-    protected JavaPropsMapper newObjectMapper() {
-        return mapperBuilder().build();
-    }
-
-    protected JavaPropsMapper.Builder mapperBuilder() {
+    
+    protected JavaPropsMapper.Builder propertiesMapperBuilder() {
         return JavaPropsMapper.builder();
     }
-    
-    protected JavaPropsMapper.Builder mapperBuilder(JavaPropsFactory f) {
+
+    protected JavaPropsMapper.Builder propertiesMapperBuilder(JavaPropsFactory f) {
         return JavaPropsMapper.builder(f);
     }
-
+    
     /*
     /**********************************************************
     /* Helper methods; read helpers

properties/src/test/java/com/fasterxml/jackson/dataformat/javaprop/NumberDeserWithPropsTest.java

@@ -54,12 +54,12 @@ static class NestedBigDecimalHolder2784 {
     /**********************************************************************
      */
 
-    private final JavaPropsMapper MAPPER = newObjectMapper();
+    private final JavaPropsMapper MAPPER = newPropertiesMapper();
 
     // [databind#2644]
     public void testBigDecimalSubtypes() throws Exception
     {
-        ObjectMapper mapper = mapperBuilder()
+        ObjectMapper mapper = propertiesMapperBuilder()
                 .registerSubtypes(NodeParent2644.class)
                 .build();
         NodeRoot2644 root = mapper.readValue(

properties/src/test/java/com/fasterxml/jackson/dataformat/javaprop/PrefixTest.java

@@ -5,7 +5,7 @@
 
 public class PrefixTest extends ModuleTestBase
 {
-    private final JavaPropsMapper MAPPER = newObjectMapper();
+    private final JavaPropsMapper MAPPER = newPropertiesMapper();
 
     public void testPrefixParsing() throws Exception {
         final String INPUT = "org.o1.firstName=Bob\n"