Merge branch '2.19'

Author: cowtowncoder

cbor/src/main/java/tools/jackson/dataformat/cbor/CBORParser.java

@@ -7,9 +7,7 @@
 import java.math.BigInteger;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Stack;
+import java.util.*;
 
 import tools.jackson.core.*;
 import tools.jackson.core.base.ParserBase;

cbor/src/test/java/tools/jackson/dataformat/cbor/BrokenLongBinary186Test.java

@@ -2,12 +2,17 @@
 
 import java.io.ByteArrayOutputStream;
 
+import org.junit.jupiter.api.Test;
+
 import tools.jackson.core.JsonParser;
 import tools.jackson.core.JsonToken;
 import tools.jackson.core.exc.StreamReadException;
 
 import tools.jackson.databind.ObjectMapper;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
 // Mostly for [dataformats-binary#186]: corrupt encoding indicating humongous payload
 public class BrokenLongBinary186Test extends CBORTestBase
 {
@@ -20,12 +25,14 @@ public class BrokenLongBinary186Test extends CBORTestBase
      */
 
     // [dataformats-binary#186]
+    @Test
     public void testCorruptVeryLongBinary() throws Exception {
         // Let's do about 2 GB to likely trigger failure
         _testCorruptLong(1_999_999_999, 95000);
     }
 
     // [dataformats-binary#186]
+    @Test
     public void testCorruptQuiteLongBinary() throws Exception {
         // Value below limit for chunked handling
         _testCorruptLong(CBORParser.LONGEST_NON_CHUNKED_BINARY >> 1, 37);
@@ -51,6 +58,7 @@ private void _testCorruptLong(int allegedLength, int actualIncluded)
      */
 
     // [dataformats-binary#186]
+    @Test
     public void testQuiteLongStreaming() throws Exception
     {
         // Can try bit shorter here, like 500 megs

cbor/src/test/java/tools/jackson/dataformat/cbor/CBORFactoryPropertiesTest.java

@@ -2,11 +2,13 @@
 
 import java.io.*;
 
+import org.junit.jupiter.api.Test;
+
 import tools.jackson.core.*;
 
 import tools.jackson.databind.ObjectMapper;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * Miscellaneous tests for {@link CBORFactory}, and for some aspects
@@ -18,6 +20,7 @@ public class CBORFactoryPropertiesTest extends CBORTestBase
 
     private final static CBORFactory CBOR_F = new CBORFactory();
 
+    @Test
     public void testCBORFactorySerializable() throws Exception
     {
         CBORFactory f = new CBORFactory();
@@ -32,6 +35,7 @@ public void testCBORFactorySerializable() throws Exception
         assertArrayEquals(doc, docOut);
     }
 
+    @Test
     public void testCBORFactoryCopy() throws Exception
     {
         CBORFactory f2 = CBOR_F.copy();
@@ -52,6 +56,7 @@ private byte[] cborDoc(TokenStreamFactory f, String json) throws IOException
         }
     }
 
+    @Test
     public void testVersions() throws Exception
     {
         ObjectMapper mapper = sharedMapper();
@@ -69,13 +74,15 @@ public void testVersions() throws Exception
         p.close();
     }
 
+    @Test
     public void testCapabilities() throws Exception
     {
         assertTrue(CBOR_F.canHandleBinaryNatively());
         assertEquals(null, CBOR_F.getFormatReadFeatureType());
         assertEquals(CBORWriteFeature.class, CBOR_F.getFormatWriteFeatureType());
     }
 
+    @Test
     public void testInabilityToReadChars() throws Exception
     {
         final String EXP = "Cannot create parser for character-based (not byte-based)";
@@ -99,6 +106,7 @@ public void testInabilityToReadChars() throws Exception
         }
     }
 
+    @Test
     public void testInabilityToWriteChars() throws Exception
     {
         try {

cbor/src/test/java/tools/jackson/dataformat/cbor/CBORTestBase.java

@@ -1,15 +1,10 @@
 package tools.jackson.dataformat.cbor;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Random;
 
-import org.junit.Assert;
-
 import tools.jackson.core.*;
 
 import tools.jackson.databind.ObjectMapper;
@@ -18,8 +13,9 @@
 
 import tools.jackson.dataformat.cbor.databind.CBORMapper;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 public abstract class CBORTestBase
-    extends junit.framework.TestCase
 {
     // From JSON specification, sample doc...
     protected final static int SAMPLE_SPEC_VALUE_WIDTH = 800;
@@ -228,22 +224,22 @@ protected void verifyException(Throwable e, String... matches)
     }
 
     protected void _verifyBytes(byte[] actBytes, byte... expBytes) {
-        Assert.assertArrayEquals(expBytes, actBytes);
+        assertArrayEquals(expBytes, actBytes);
     }
 
     protected void _verifyBytes(byte[] actBytes, byte exp1, byte[] expRest) {
         byte[] expBytes = new byte[expRest.length+1];
         System.arraycopy(expRest, 0, expBytes, 1, expRest.length);
         expBytes[0] = exp1;
-        Assert.assertArrayEquals(expBytes, actBytes);
+        assertArrayEquals(expBytes, actBytes);
     }
 
     protected void _verifyBytes(byte[] actBytes, byte exp1, byte exp2, byte[] expRest) {
         byte[] expBytes = new byte[expRest.length+2];
         System.arraycopy(expRest, 0, expBytes, 2, expRest.length);
         expBytes[0] = exp1;
         expBytes[1] = exp2;
-        Assert.assertArrayEquals(expBytes, actBytes);
+        assertArrayEquals(expBytes, actBytes);
     }
 
     protected void _verifyBytes(byte[] actBytes, byte exp1, byte exp2, byte exp3, byte[] expRest) {
@@ -252,7 +248,7 @@ protected void _verifyBytes(byte[] actBytes, byte exp1, byte exp2, byte exp3, by
         expBytes[0] = exp1;
         expBytes[1] = exp2;
         expBytes[2] = exp3;
-        Assert.assertArrayEquals(expBytes, actBytes);
+        assertArrayEquals(expBytes, actBytes);
     }
 
     /**
@@ -271,7 +267,7 @@ protected String getAndVerifyText(JsonParser p) throws IOException
         if (str.length() !=  actLen) {
             fail("Internal problem (p.token == "+p.currentToken()+"): p.getText().length() ['"+str+"'] == "+str.length()+"; p.getTextLength() == "+actLen);
         }
-        assertEquals("String access via getText(), getTextXxx() must be the same", str, str2);
+        assertEquals(str, str2, "String access via getText(), getTextXxx() must be the same");
 
         return str;
     }

cbor/src/test/java/tools/jackson/dataformat/cbor/FloatPrecisionTest.java

@@ -3,12 +3,15 @@
 import java.io.ByteArrayOutputStream;
 import java.math.BigDecimal;
 
-import static org.junit.Assert.assertArrayEquals;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 // for [jackson-core#730]
 public class FloatPrecisionTest extends CBORTestBase
 {
     // for [jackson-core#730]
+    @Test
     public void testFloatRoundtrips() throws Exception
     {
         ByteArrayOutputStream out = new ByteArrayOutputStream();

cbor/src/test/java/tools/jackson/dataformat/cbor/FormatDefaultsTest.java

@@ -1,13 +1,18 @@
 package tools.jackson.dataformat.cbor;
 
+import org.junit.jupiter.api.Test;
+
 import tools.jackson.core.JsonParser;
 import tools.jackson.core.StreamReadCapability;
 import tools.jackson.databind.ObjectMapper;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 public class FormatDefaultsTest extends CBORTestBase
 {
     private final ObjectMapper MAPPER = cborMapper();
 
+    @Test
     public void testParserDefaults() throws Exception
     {
         try (JsonParser p = MAPPER.createParser(new byte[4])) {

cbor/src/test/java/tools/jackson/dataformat/cbor/GeneratorDeepNestingTest.java

@@ -1,20 +1,26 @@
 package tools.jackson.dataformat.cbor;
 
 import java.io.ByteArrayOutputStream;
-import java.util.*;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.jupiter.api.Test;
 
 import tools.jackson.core.JsonGenerator;
 
 import tools.jackson.databind.ObjectMapper;
 
 import tools.jackson.dataformat.cbor.databind.CBORMapper;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class GeneratorDeepNestingTest extends CBORTestBase
 {
     private final ObjectMapper MAPPER =  CBORMapper.shared();
 
     // for [dataformats-binary#62]
     @SuppressWarnings("unchecked")
+    @Test
     public void testDeeplyNestedMap() throws Exception
     {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -62,6 +68,7 @@ private void _verifyNestedMap(Map<String,?> map, int level) {
         }
     }
 
+    @Test
     public void testDeeplyNestedArray() throws Exception
     {
         ByteArrayOutputStream out = new ByteArrayOutputStream();

cbor/src/test/java/tools/jackson/dataformat/cbor/GeneratorDupHandlingTest.java

@@ -1,12 +1,19 @@
 package tools.jackson.dataformat.cbor;
 
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+import org.junit.jupiter.api.Test;
 
 import tools.jackson.core.*;
 import tools.jackson.core.exc.StreamWriteException;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.fail;
+
 public class GeneratorDupHandlingTest extends CBORTestBase
 {
+    @Test
     public void testSimpleDupsEagerlyBytes() throws Exception {
         _testSimpleDups(false, new CBORFactory());
     }

cbor/src/test/java/tools/jackson/dataformat/cbor/GeneratorInteropTest.java

@@ -2,8 +2,12 @@
 
 import java.io.ByteArrayOutputStream;
 
+import org.junit.jupiter.api.Test;
+
 import tools.jackson.core.ObjectWriteContext;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
 /**
  * Unit tests geared at testing issues that were raised due to
  * inter-operability with other CBOR codec implementations
@@ -18,6 +22,7 @@ public class GeneratorInteropTest extends CBORTestBase
     };
 
     // Test for [Issue#6], for optional writing of CBOR Type Description Tag
+    @Test
     public void testTypeDescriptionTag() throws Exception
     {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -30,6 +35,7 @@ public void testTypeDescriptionTag() throws Exception
         _verifyBytes(out.toByteArray(), TYPE_DESC_AND_TRUE);
     }
 
+    @Test
     public void testAutoTypeDescription() throws Exception
     {
         ByteArrayOutputStream out = new ByteArrayOutputStream();

cbor/src/test/java/tools/jackson/dataformat/cbor/GeneratorInvalidCallsTest.java

@@ -4,6 +4,8 @@
 
 import tools.jackson.core.exc.StreamWriteException;
 
+import static org.junit.jupiter.api.Assertions.fail;
+
 public class GeneratorInvalidCallsTest extends CBORTestBase
 {
     public void testInvalidFieldNameInRoot()