Skip to content

Commit 333500b

Browse files
cowtowncodercowtowncoder
authored
Merge branch '2.19' into joohyukkim/2.19/547-migrate-smile-module
2 parents bda4f97 + 697797b commit 333500b

File tree

74 files changed

+579
-207
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+579
-207
lines changed

‎cbor/src/main/java/com/fasterxml/jackson/dataformat/cbor/CBORFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import com.fasterxml.jackson.core.*;
77
import com.fasterxml.jackson.core.format.InputAccessor;
88
import com.fasterxml.jackson.core.format.MatchStrength;
9-
import com.fasterxml.jackson.core.io.IOContext;
109
import com.fasterxml.jackson.core.io.ContentReference;
10+
import com.fasterxml.jackson.core.io.IOContext;
1111

1212
/**
1313
* Factory used for constructing {@link CBORParser} and {@link CBORGenerator}

‎cbor/src/main/java/com/fasterxml/jackson/dataformat/cbor/CBORGenerator.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.fasterxml.jackson.dataformat.cbor;
22

3-
import java.nio.ByteBuffer;
4-
import java.nio.charset.StandardCharsets;
5-
import java.util.Arrays;
63
import java.io.*;
74
import java.math.BigDecimal;
85
import java.math.BigInteger;
6+
import java.nio.ByteBuffer;
7+
import java.nio.charset.StandardCharsets;
8+
import java.util.Arrays;
99
import java.util.HashMap;
1010

1111
import com.fasterxml.jackson.core.*;

‎cbor/src/main/java/com/fasterxml/jackson/dataformat/cbor/CBORParser.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,15 @@
55
import java.math.BigInteger;
66
import java.nio.charset.Charset;
77
import java.nio.charset.StandardCharsets;
8-
import java.util.ArrayList;
9-
import java.util.Arrays;
10-
import java.util.Stack;
8+
import java.util.*;
119

1210
import com.fasterxml.jackson.core.*;
1311
import com.fasterxml.jackson.core.base.ParserMinimalBase;
1412
import com.fasterxml.jackson.core.io.IOContext;
1513
import com.fasterxml.jackson.core.io.NumberInput;
1614
import com.fasterxml.jackson.core.json.DupDetector;
1715
import com.fasterxml.jackson.core.sym.ByteQuadsCanonicalizer;
18-
import com.fasterxml.jackson.core.util.ByteArrayBuilder;
19-
import com.fasterxml.jackson.core.util.JacksonFeatureSet;
20-
import com.fasterxml.jackson.core.util.TextBuffer;
16+
import com.fasterxml.jackson.core.util.*;
2117

2218
import static com.fasterxml.jackson.dataformat.cbor.CBORConstants.*;
2319

‎cbor/src/main/java/com/fasterxml/jackson/dataformat/cbor/CBORParserBootstrapper.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package com.fasterxml.jackson.dataformat.cbor;
22

3-
import java.io.*;
3+
import java.io.IOException;
4+
import java.io.InputStream;
45

5-
import com.fasterxml.jackson.core.*;
6+
import com.fasterxml.jackson.core.JsonParseException;
7+
import com.fasterxml.jackson.core.ObjectCodec;
68
import com.fasterxml.jackson.core.format.InputAccessor;
79
import com.fasterxml.jackson.core.format.MatchStrength;
810
import com.fasterxml.jackson.core.io.IOContext;

‎cbor/src/main/java/com/fasterxml/jackson/dataformat/cbor/databind/CBORMapper.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@
22

33
import com.fasterxml.jackson.core.JsonFactory;
44
import com.fasterxml.jackson.core.Version;
5-
65
import com.fasterxml.jackson.databind.ObjectMapper;
76
import com.fasterxml.jackson.databind.cfg.MapperBuilder;
8-
9-
import com.fasterxml.jackson.dataformat.cbor.CBORFactory;
10-
import com.fasterxml.jackson.dataformat.cbor.CBORGenerator;
11-
import com.fasterxml.jackson.dataformat.cbor.PackageVersion;
7+
import com.fasterxml.jackson.dataformat.cbor.*;
128

139
/**
1410
* Specialized {@link ObjectMapper} to use with CBOR format backend.

‎cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/BrokenLongBinary186Test.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22

33
import java.io.ByteArrayOutputStream;
44

5-
import com.fasterxml.jackson.core.JsonParser;
6-
import com.fasterxml.jackson.core.JsonProcessingException;
7-
import com.fasterxml.jackson.core.JsonToken;
5+
import org.junit.jupiter.api.Test;
86

7+
import com.fasterxml.jackson.core.*;
98
import com.fasterxml.jackson.databind.ObjectMapper;
109

10+
import static org.junit.jupiter.api.Assertions.assertEquals;
11+
import static org.junit.jupiter.api.Assertions.fail;
12+
1113
// Mostly for [dataformats-binary#186]: corrupt encoding indicating humongous payload
1214
public class BrokenLongBinary186Test extends CBORTestBase
1315
{
@@ -20,12 +22,14 @@ public class BrokenLongBinary186Test extends CBORTestBase
2022
*/
2123

2224
// [dataformats-binary#186]
25+
@Test
2326
public void testCorruptVeryLongBinary() throws Exception {
2427
// Let's do about 2 GB to likely trigger failure
2528
_testCorruptLong(1_999_999_999, 95000);
2629
}
2730

2831
// [dataformats-binary#186]
32+
@Test
2933
public void testCorruptQuiteLongBinary() throws Exception {
3034
// Value below limit for chunked handling
3135
_testCorruptLong(CBORParser.LONGEST_NON_CHUNKED_BINARY >> 1, 37);
@@ -51,6 +55,7 @@ private void _testCorruptLong(int allegedLength, int actualIncluded) throws Exce
5155
*/
5256

5357
// [dataformats-binary#186]
58+
@Test
5459
public void testQuiteLongStreaming() throws Exception
5560
{
5661
// Can try bit shorter here, like 500 megs

‎cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/CBORFactoryPropertiesTest.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22

33
import java.io.*;
44

5+
import org.junit.jupiter.api.Test;
6+
57
import com.fasterxml.jackson.core.*;
68

7-
import static org.junit.Assert.assertArrayEquals;
9+
import static org.junit.jupiter.api.Assertions.*;
810

911
/**
1012
* Miscellaneous tests for {@link CBORFactory}, and for some aspects
@@ -16,6 +18,7 @@ public class CBORFactoryPropertiesTest extends CBORTestBase
1618

1719
private final static CBORFactory CBOR_F = new CBORFactory();
1820

21+
@Test
1922
public void testCBORFactorySerializable() throws Exception
2023
{
2124
CBORFactory f = new CBORFactory();
@@ -30,6 +33,7 @@ public void testCBORFactorySerializable() throws Exception
3033
assertArrayEquals(doc, docOut);
3134
}
3235

36+
@Test
3337
public void testCBORFactoryCopy() throws Exception
3438
{
3539
CBORFactory f2 = CBOR_F.copy();
@@ -39,6 +43,7 @@ public void testCBORFactoryCopy() throws Exception
3943
assertNotNull(doc);
4044
}
4145

46+
@Test
4247
public void testVersions() throws Exception
4348
{
4449
CBORFactory f = CBOR_F;
@@ -55,6 +60,7 @@ public void testVersions() throws Exception
5560
p.close();
5661
}
5762

63+
@Test
5864
public void testCapabilities() throws Exception
5965
{
6066
assertTrue(CBOR_F.canHandleBinaryNatively());
@@ -63,6 +69,7 @@ public void testCapabilities() throws Exception
6369
assertEquals(CBORGenerator.Feature.class, CBOR_F.getFormatWriteFeatureType());
6470
}
6571

72+
@Test
6673
public void testInabilityToReadChars() throws Exception
6774
{
6875
final String EXP = "non-byte-based source";
@@ -86,6 +93,7 @@ public void testInabilityToReadChars() throws Exception
8693
}
8794
}
8895

96+
@Test
8997
public void testInabilityToWriteChars() throws Exception
9098
{
9199
try {

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

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
package com.fasterxml.jackson.dataformat.cbor;
22

3-
import java.io.ByteArrayOutputStream;
4-
import java.io.IOException;
5-
import java.io.InputStream;
3+
import java.io.*;
64
import java.nio.charset.StandardCharsets;
75
import java.util.Arrays;
86
import java.util.Random;
97

10-
import org.junit.Assert;
11-
128
import com.fasterxml.jackson.core.*;
139
import com.fasterxml.jackson.dataformat.cbor.databind.CBORMapper;
1410

11+
import static org.junit.jupiter.api.Assertions.*;
12+
1513
public abstract class CBORTestBase
16-
extends junit.framework.TestCase
1714
{
1815
/*
1916
/**********************************************************
@@ -161,22 +158,22 @@ protected void verifyException(Throwable e, String... matches)
161158
}
162159

163160
protected void _verifyBytes(byte[] actBytes, byte... expBytes) {
164-
Assert.assertArrayEquals(expBytes, actBytes);
161+
assertArrayEquals(expBytes, actBytes);
165162
}
166163

167164
protected void _verifyBytes(byte[] actBytes, byte exp1, byte[] expRest) {
168165
byte[] expBytes = new byte[expRest.length+1];
169166
System.arraycopy(expRest, 0, expBytes, 1, expRest.length);
170167
expBytes[0] = exp1;
171-
Assert.assertArrayEquals(expBytes, actBytes);
168+
assertArrayEquals(expBytes, actBytes);
172169
}
173170

174171
protected void _verifyBytes(byte[] actBytes, byte exp1, byte exp2, byte[] expRest) {
175172
byte[] expBytes = new byte[expRest.length+2];
176173
System.arraycopy(expRest, 0, expBytes, 2, expRest.length);
177174
expBytes[0] = exp1;
178175
expBytes[1] = exp2;
179-
Assert.assertArrayEquals(expBytes, actBytes);
176+
assertArrayEquals(expBytes, actBytes);
180177
}
181178

182179
protected void _verifyBytes(byte[] actBytes, byte exp1, byte exp2, byte exp3, byte[] expRest) {
@@ -185,7 +182,7 @@ protected void _verifyBytes(byte[] actBytes, byte exp1, byte exp2, byte exp3, by
185182
expBytes[0] = exp1;
186183
expBytes[1] = exp2;
187184
expBytes[2] = exp3;
188-
Assert.assertArrayEquals(expBytes, actBytes);
185+
assertArrayEquals(expBytes, actBytes);
189186
}
190187

191188
/**
@@ -204,7 +201,7 @@ protected String getAndVerifyText(JsonParser p) throws IOException
204201
if (str.length() != actLen) {
205202
fail("Internal problem (p.token == "+p.getCurrentToken()+"): p.getText().length() ['"+str+"'] == "+str.length()+"; p.getTextLength() == "+actLen);
206203
}
207-
assertEquals("String access via getText(), getTextXxx() must be the same", str, str2);
204+
assertEquals(str, str2, "String access via getText(), getTextXxx() must be the same");
208205

209206
return str;
210207
}

‎cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/FloatPrecisionTest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@
33
import java.io.ByteArrayOutputStream;
44
import java.math.BigDecimal;
55

6-
import static org.junit.Assert.assertArrayEquals;
6+
import org.junit.jupiter.api.Test;
77

8+
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
89

910
// for [jackson-core#730]
1011
public class FloatPrecisionTest extends CBORTestBase
1112
{
1213
// for [jackson-core#730]
14+
@Test
1315
public void testFloatRoundtrips() throws Exception
1416
{
1517
ByteArrayOutputStream out = new ByteArrayOutputStream();

‎cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/FormatDefaultsTest.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
package com.fasterxml.jackson.dataformat.cbor;
22

3+
import org.junit.jupiter.api.Test;
4+
35
import com.fasterxml.jackson.core.JsonParser;
46
import com.fasterxml.jackson.core.StreamReadCapability;
57
import com.fasterxml.jackson.databind.ObjectMapper;
68

9+
import static org.junit.jupiter.api.Assertions.assertTrue;
10+
711
public class FormatDefaultsTest extends CBORTestBase
812
{
913
private final ObjectMapper MAPPER = cborMapper();
1014

15+
@Test
1116
public void testParserDefaults() throws Exception
1217
{
1318
try (JsonParser p = MAPPER.createParser(new byte[4])) {

0 commit comments

Comments
 (0)