Merge branch '2.17'

FasterXML · Nov 28, 2023 · b26054e · b26054e
2 parents 5f069b4 + 35bd198
commit b26054e
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 22 deletions.
diff --git a/...ls/jackson/databind/DatabindTestUtil.java → ...n/databind/testutil/DatabindTestUtil.java b/...ls/jackson/databind/DatabindTestUtil.java → ...n/databind/testutil/DatabindTestUtil.java
@@ -1,9 +1,11 @@
-package tools.jackson.databind;
+package tools.jackson.databind.testutil;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import tools.jackson.databind.*;
 import tools.jackson.databind.json.JsonMapper;
 
 /**
@@ -17,29 +19,29 @@ public class DatabindTestUtil
 {
     /*
     /**********************************************************
-    /* Helper methods, serialization
+    /* Mapper construction helpers
     /**********************************************************
      */
 
-    @SuppressWarnings("unchecked")
-    public static Map<String,Object> writeAndMap(ObjectMapper m, Object value)
-    {
-        String str = m.writeValueAsString(value);
-        return (Map<String,Object>) m.readValue(str, LinkedHashMap.class);
+    public static ObjectMapper newJsonMapper() {
+        return new JsonMapper();
+    }
+
+    public static JsonMapper.Builder jsonMapperBuilder() {
+        return JsonMapper.builder();
     }
 
     /*
     /**********************************************************
-    /* Construction
+    /* Helper methods, serialization
     /**********************************************************
      */
 
-    public static ObjectMapper newJsonMapper() {
-        return new JsonMapper();
-    }
-
-    public static JsonMapper.Builder jsonMapperBuilder() {
-        return JsonMapper.builder();
+    @SuppressWarnings("unchecked")
+    public static Map<String,Object> writeAndMap(ObjectMapper m, Object value)
+    {
+        String str = m.writeValueAsString(value);
+        return (Map<String,Object>) m.readValue(str, LinkedHashMap.class);
     }
 
     /*
@@ -51,4 +53,12 @@ public static JsonMapper.Builder jsonMapperBuilder() {
     public static String a2q(String json) {
         return json.replace("'", "\"");
     }
+
+    public static String q(String str) {
+        return '"'+str+'"';
+    }
+
+    public static byte[] utf8Bytes(String str) {
+        return str.getBytes(StandardCharsets.UTF_8);
+    }
 }
diff --git a/src/test/java/tools/jackson/databind/views/DefaultViewTest.java b/src/test/java/tools/jackson/databind/views/DefaultViewTest.java
@@ -1,7 +1,7 @@
 package tools.jackson.databind.views;
 
 import static org.junit.Assert.assertEquals;
-import static tools.jackson.databind.DatabindTestUtil.a2q;
+import static tools.jackson.databind.testutil.DatabindTestUtil.a2q;
 
 import java.io.IOException;
 

diff --git a/src/test/java/tools/jackson/databind/views/TestViewDeserialization.java b/src/test/java/tools/jackson/databind/views/TestViewDeserialization.java
@@ -2,8 +2,8 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
-import static tools.jackson.databind.DatabindTestUtil.a2q;
-import static tools.jackson.databind.DatabindTestUtil.jsonMapperBuilder;
+import static tools.jackson.databind.testutil.DatabindTestUtil.a2q;
+import static tools.jackson.databind.testutil.DatabindTestUtil.jsonMapperBuilder;
 
 import org.junit.jupiter.api.Test;
 

diff --git a/src/test/java/tools/jackson/databind/views/TestViewSerialization.java b/src/test/java/tools/jackson/databind/views/TestViewSerialization.java
@@ -1,8 +1,8 @@
 package tools.jackson.databind.views;
 
-import static tools.jackson.databind.DatabindTestUtil.jsonMapperBuilder;
-import static tools.jackson.databind.DatabindTestUtil.newJsonMapper;
-import static tools.jackson.databind.DatabindTestUtil.writeAndMap;
+import static tools.jackson.databind.testutil.DatabindTestUtil.jsonMapperBuilder;
+import static tools.jackson.databind.testutil.DatabindTestUtil.newJsonMapper;
+import static tools.jackson.databind.testutil.DatabindTestUtil.writeAndMap;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 

diff --git a/src/test/java/tools/jackson/databind/views/TestViewsSerialization2.java b/src/test/java/tools/jackson/databind/views/TestViewsSerialization2.java
@@ -2,7 +2,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static tools.jackson.databind.DatabindTestUtil.jsonMapperBuilder;
+import static tools.jackson.databind.testutil.DatabindTestUtil.jsonMapperBuilder;
 
 import java.io.*;
 

diff --git a/src/test/java/tools/jackson/databind/views/ViewsWithCreatorTest.java b/src/test/java/tools/jackson/databind/views/ViewsWithCreatorTest.java
@@ -1,7 +1,7 @@
 package tools.jackson.databind.views;
 
 import static org.junit.Assert.assertEquals;
-import static tools.jackson.databind.DatabindTestUtil.newJsonMapper;
+import static tools.jackson.databind.testutil.DatabindTestUtil.newJsonMapper;
 
 import org.junit.jupiter.api.Test;