Merge branch '2.21' into 2.x

Author: cowtowncoder

cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/CBORTestBase.java

@@ -110,6 +110,18 @@ protected CBORGenerator stringrefCborGenerator(ByteArrayOutputStream result)
                 .createGenerator(result);
     }
 
+    /*
+    /**********************************************************
+    /* Parser construction
+    /**********************************************************
+     */
+
+    protected JsonParser createParserUsingStream(TokenStreamFactory f, byte[] input)
+        throws IOException
+    {
+        return f.createParser(new ByteArrayInputStream(input));
+    }
+
     /*
     /**********************************************************
     /* Additional assertion methods

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

@@ -269,6 +269,10 @@ protected static byte[] utf8Bytes(String str) {
         return str.getBytes(StandardCharsets.UTF_8);
     }
 
+    protected static String utf8String(ByteArrayOutputStream bytes) {
+        return new String(bytes.toByteArray(), StandardCharsets.UTF_8);
+    }
+    
     protected static byte[] concat(byte[] ... chunks)
     {
         int len = 0;