Merge branch '2.18' into 2.19

Author: cowtowncoder

smile/src/test/java/com/fasterxml/jackson/dataformat/smile/BaseTestForSmile.java

@@ -1,6 +1,7 @@
 package com.fasterxml.jackson.dataformat.smile;
 
 import java.io.*;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 
 import com.fasterxml.jackson.core.*;
@@ -157,6 +158,18 @@ public static IOContext testIOContext() {
                 new BufferRecycler(), ContentReference.unknown(), false);
     }
 
+    /*
+    /**********************************************************
+    /* Parser construction
+    /**********************************************************
+     */
+
+    protected JsonParser createParserUsingStream(TokenStreamFactory f, byte[] input)
+        throws IOException
+    {
+        return f.createParser(new ByteArrayInputStream(input));
+    }
+
     /*
     /**********************************************************
     /* Additional assertion methods
@@ -252,6 +265,10 @@ public String q(String str) {
         return '"'+str+'"';
     }
 
+    protected static byte[] utf8Bytes(String str) {
+        return str.getBytes(StandardCharsets.UTF_8);
+    }
+
     protected static byte[] concat(byte[] ... chunks)
     {
         int len = 0;

smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/AsyncTestBase.java

@@ -6,7 +6,7 @@
 import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
 import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 
-abstract class AsyncTestBase extends BaseTestForSmile
+public abstract class AsyncTestBase extends BaseTestForSmile
 {
     final static String SPACES = "                ";