Minor refactoring for #4217: move DatabindTestUtil under .../testutil

Author: cowtowncoder

src/test/java/com/fasterxml/jackson/databind/DatabindTestUtil.java renamed to src/test/java/com/fasterxml/jackson/databind/testutil/DatabindTestUtil.java

@@ -1,10 +1,13 @@
-package com.fasterxml.jackson.databind;
+package com.fasterxml.jackson.databind.testutil;
 
-import com.fasterxml.jackson.databind.json.JsonMapper;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+
 /**
  * Class containing test utility methods.
  * The methods are migrated from {@link BaseMapTest} and {@link BaseTest},
@@ -14,6 +17,19 @@
  */
 public class DatabindTestUtil
 {
+    /*
+    /**********************************************************
+    /* Mapper construction helpers
+    /**********************************************************
+     */
+
+    public static ObjectMapper newJsonMapper() {
+        return new JsonMapper();
+    }
+
+    public static JsonMapper.Builder jsonMapperBuilder() {
+        return JsonMapper.builder();
+    }
 
     /*
     /**********************************************************
@@ -31,25 +47,19 @@ public static Map<String,Object> writeAndMap(ObjectMapper m, Object value)
 
     /*
     /**********************************************************
-    /* Construction
+    /* Encoding or String representations
     /**********************************************************
      */
 
-    public static ObjectMapper newJsonMapper() {
-        return new JsonMapper();
+    public static String a2q(String json) {
+        return json.replace("'", "\"");
     }
 
-    public static JsonMapper.Builder jsonMapperBuilder() {
-        return JsonMapper.builder();
+    public static String q(String str) {
+        return '"'+str+'"';
     }
 
-    /*
-    /**********************************************************
-    /* Encoding or String representations
-    /**********************************************************
-     */
-
-    public static String a2q(String json) {
-        return json.replace("'", "\"");
+    public static byte[] utf8Bytes(String str) {
+        return str.getBytes(StandardCharsets.UTF_8);
     }
 }

src/test/java/com/fasterxml/jackson/databind/views/DefaultViewTest.java

@@ -1,6 +1,6 @@
 package com.fasterxml.jackson.databind.views;
 
-import static com.fasterxml.jackson.databind.DatabindTestUtil.a2q;
+import static com.fasterxml.jackson.databind.testutil.DatabindTestUtil.a2q;
 import static org.junit.Assert.assertEquals;
 import java.io.IOException;
 

src/test/java/com/fasterxml/jackson/databind/views/TestViewDeserialization.java

@@ -1,7 +1,7 @@
 package com.fasterxml.jackson.databind.views;
 
-import static com.fasterxml.jackson.databind.DatabindTestUtil.a2q;
-import static com.fasterxml.jackson.databind.DatabindTestUtil.jsonMapperBuilder;
+import static com.fasterxml.jackson.databind.testutil.DatabindTestUtil.a2q;
+import static com.fasterxml.jackson.databind.testutil.DatabindTestUtil.jsonMapperBuilder;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import com.fasterxml.jackson.annotation.JsonCreator;

src/test/java/com/fasterxml/jackson/databind/views/TestViewSerialization.java

@@ -1,8 +1,8 @@
 package com.fasterxml.jackson.databind.views;
 
-import static com.fasterxml.jackson.databind.DatabindTestUtil.jsonMapperBuilder;
-import static com.fasterxml.jackson.databind.DatabindTestUtil.newJsonMapper;
-import static com.fasterxml.jackson.databind.DatabindTestUtil.writeAndMap;
+import static com.fasterxml.jackson.databind.testutil.DatabindTestUtil.jsonMapperBuilder;
+import static com.fasterxml.jackson.databind.testutil.DatabindTestUtil.newJsonMapper;
+import static com.fasterxml.jackson.databind.testutil.DatabindTestUtil.writeAndMap;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import java.io.*;

src/test/java/com/fasterxml/jackson/databind/views/TestViewsSerialization2.java

@@ -1,6 +1,6 @@
 package com.fasterxml.jackson.databind.views;
 
-import static com.fasterxml.jackson.databind.DatabindTestUtil.jsonMapperBuilder;
+import static com.fasterxml.jackson.databind.testutil.DatabindTestUtil.jsonMapperBuilder;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import java.io.*;

src/test/java/com/fasterxml/jackson/databind/views/ViewsWithCreatorTest.java

@@ -1,6 +1,6 @@
 package com.fasterxml.jackson.databind.views;
 
-import static com.fasterxml.jackson.databind.DatabindTestUtil.newJsonMapper;
+import static com.fasterxml.jackson.databind.testutil.DatabindTestUtil.newJsonMapper;
 import static org.junit.Assert.assertEquals;
 import com.fasterxml.jackson.annotation.*;