Skip to content

Commit 5188ff1

Browse files
JooHyukKimJooHyukKim
committed
Migrate protobuf module tests to JUnit5
1 parent 26b5e2a commit 5188ff1

40 files changed

+277
-105
lines changed

‎protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/schema/FieldTypes.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.fasterxml.jackson.dataformat.protobuf.schema;
22

3-
import java.util.*;
3+
import java.util.EnumMap;
44

55
import com.squareup.protoparser.DataType;
66

‎protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/schema/FileDescriptorSet.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
import java.util.EnumMap;
44
import java.util.Map;
55

6-
import com.squareup.protoparser.DataType;
7-
import com.squareup.protoparser.EnumConstantElement;
8-
import com.squareup.protoparser.EnumElement;
9-
import com.squareup.protoparser.FieldElement;
10-
import com.squareup.protoparser.MessageElement;
11-
import com.squareup.protoparser.OptionElement;
12-
import com.squareup.protoparser.ProtoFile;
6+
import com.squareup.protoparser.*;
137

148
/**
159
* @since 2.9

‎protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/schemagen/ProtoBufSchemaVisitor.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
import java.util.LinkedHashSet;
44
import java.util.Set;
55

6+
import com.squareup.protoparser.DataType;
7+
import com.squareup.protoparser.DataType.ScalarType;
8+
import com.squareup.protoparser.TypeElement;
9+
610
import com.fasterxml.jackson.core.JsonParser.NumberType;
711
import com.fasterxml.jackson.databind.JavaType;
812
import com.fasterxml.jackson.databind.SerializerProvider;
913
import com.fasterxml.jackson.databind.jsonFormatVisitors.*;
1014

11-
import com.squareup.protoparser.DataType;
12-
import com.squareup.protoparser.TypeElement;
13-
import com.squareup.protoparser.DataType.ScalarType;
14-
1515
public class ProtoBufSchemaVisitor extends JsonFormatVisitorWrapper.Base
1616
implements TypeElementBuilder
1717
{

‎protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/schemagen/ProtobufSchemaGenerator.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import com.fasterxml.jackson.databind.JavaType;
88
import com.fasterxml.jackson.databind.JsonMappingException;
99
import com.fasterxml.jackson.databind.jsonFormatVisitors.*;
10-
1110
import com.fasterxml.jackson.dataformat.protobuf.schema.NativeProtobufSchema;
1211
import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufSchema;
1312

‎protobuf/src/test/java/com/fasterxml/jackson/dataformat/protobuf/EnumHandlingTest.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
package com.fasterxml.jackson.dataformat.protobuf;
22

3+
import org.junit.jupiter.api.Test;
4+
35
import com.fasterxml.jackson.core.type.TypeReference;
46
import com.fasterxml.jackson.databind.ObjectReader;
57
import com.fasterxml.jackson.databind.ObjectWriter;
68
import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufSchema;
79

10+
import static org.junit.jupiter.api.Assertions.assertEquals;
11+
import static org.junit.jupiter.api.Assertions.assertNotNull;
12+
813
public class EnumHandlingTest extends ProtobufTestBase
914
{
1015
enum TinyEnum {
@@ -38,6 +43,7 @@ static class BigEnumWrapper {
3843

3944
final ProtobufMapper MAPPER = newObjectMapper();
4045

46+
@Test
4147
public void testBigEnum() throws Exception
4248
{
4349
ProtobufSchema schema = MAPPER.generateSchemaFor(BigEnumWrapper.class);
@@ -55,6 +61,7 @@ public void testBigEnum() throws Exception
5561
assertEquals(input.value, result.value);
5662
}
5763

64+
@Test
5865
public void testTinyEnum() throws Exception
5966
{
6067
ProtobufSchema schema = MAPPER.generateSchemaFor(TinyEnumWrapper.class);

‎protobuf/src/test/java/com/fasterxml/jackson/dataformat/protobuf/FactoryPropertiesTest.java‎

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

33
import java.io.*;
44

5-
import com.fasterxml.jackson.core.JsonGenerator;
6-
import com.fasterxml.jackson.core.JsonParser;
7-
import com.fasterxml.jackson.core.StreamReadCapability;
8-
import com.fasterxml.jackson.databind.ObjectMapper;
5+
import org.junit.jupiter.api.Test;
96

7+
import com.fasterxml.jackson.core.*;
8+
import com.fasterxml.jackson.databind.ObjectMapper;
109
import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufSchema;
1110
import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufSchemaLoader;
1211

12+
import static org.junit.jupiter.api.Assertions.*;
13+
1314
public class FactoryPropertiesTest extends ProtobufTestBase
1415
{
1516
final ProtobufSchema POINT_SCHEMA;
@@ -22,6 +23,7 @@ public FactoryPropertiesTest() throws IOException {
2223
POINT_SCHEMA = ProtobufSchemaLoader.std.parse(PROTOC_BOX, "Point");
2324
}
2425

26+
@Test
2527
public void testProtoFactorySerializable() throws Exception
2628
{
2729
ProtobufFactory f = new ProtobufFactory();
@@ -34,6 +36,7 @@ public void testProtoFactorySerializable() throws Exception
3436
assertNotNull(f2);
3537
}
3638

39+
@Test
3740
public void testProtoFactoryCopy() throws Exception
3841
{
3942
ProtobufFactory f2 = PROTO_F.copy();
@@ -43,6 +46,7 @@ public void testProtoFactoryCopy() throws Exception
4346
assertNotNull(doc);
4447
}
4548

49+
@Test
4650
public void testVersions() throws Exception
4751
{
4852
ProtobufFactory f = PROTO_F;
@@ -60,6 +64,7 @@ public void testVersions() throws Exception
6064
p.close();
6165
}
6266

67+
@Test
6368
public void testCapabilities() throws Exception
6469
{
6570
assertTrue(PROTO_F.canHandleBinaryNatively());
@@ -68,6 +73,7 @@ public void testCapabilities() throws Exception
6873
assertNull(PROTO_F.getFormatWriteFeatureType());
6974
}
7075

76+
@Test
7177
public void testInabilityToReadChars() throws Exception
7278
{
7379
final String EXP = "non-byte-based source";
@@ -91,6 +97,7 @@ public void testInabilityToReadChars() throws Exception
9197
}
9298
}
9399

100+
@Test
94101
public void testInabilityToWriteChars() throws Exception
95102
{
96103
try {
@@ -102,6 +109,7 @@ public void testInabilityToWriteChars() throws Exception
102109
}
103110

104111
// @since 2.14
112+
@Test
105113
public void testStreamReadCapabilities() throws Exception
106114
{
107115
byte[] doc = _writeDoc(PROTO_F);

‎protobuf/src/test/java/com/fasterxml/jackson/dataformat/protobuf/NestedWrite67Test.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
package com.fasterxml.jackson.dataformat.protobuf;
22

3+
import org.junit.jupiter.api.Test;
4+
35
import com.fasterxml.jackson.annotation.JsonProperty;
46
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
5-
67
import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufSchema;
78

9+
import static org.junit.jupiter.api.Assertions.assertEquals;
10+
811
public class NestedWrite67Test extends ProtobufTestBase
912
{
1013
@JsonPropertyOrder({ "value1", "level2" })
@@ -36,6 +39,7 @@ public static class Level3 {
3639
/**********************************************************
3740
*/
3841

42+
@Test
3943
public void testIssue67() throws Exception
4044
{
4145
ProtobufSchema schema = MAPPER.generateSchemaFor(Level1.class);

‎protobuf/src/test/java/com/fasterxml/jackson/dataformat/protobuf/NextXxxParsingTest.java‎

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

3+
import org.junit.jupiter.api.Test;
4+
35
import com.fasterxml.jackson.core.JsonParser;
46
import com.fasterxml.jackson.core.JsonToken;
57
import com.fasterxml.jackson.core.io.SerializedString;
@@ -8,6 +10,8 @@
810
import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufSchema;
911
import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufSchemaLoader;
1012

13+
import static org.junit.jupiter.api.Assertions.*;
14+
1115
public class NextXxxParsingTest extends ProtobufTestBase
1216
{
1317
final private static String PROTOC_STRINGS =
@@ -25,6 +29,7 @@ public Strings() { }
2529

2630
final ObjectMapper MAPPER = new ObjectMapper(new ProtobufFactory());
2731

32+
@Test
2833
public void testNextFieldAndText() throws Exception
2934
{
3035
ProtobufSchema schema = ProtobufSchemaLoader.std.parse(PROTOC_STRINGS);
@@ -63,6 +68,7 @@ public void testNextFieldAndText() throws Exception
6368
p.close();
6469
}
6570

71+
@Test
6672
public void testNextInt() throws Exception
6773
{
6874
ProtobufSchema point3Schema = ProtobufSchemaLoader.std.parse(PROTOC_POINT3);

‎protobuf/src/test/java/com/fasterxml/jackson/dataformat/protobuf/ProtobufTestBase.java‎

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

3-
import java.util.ArrayList;
4-
import java.util.Arrays;
5-
import java.util.List;
3+
import java.util.*;
64

7-
import com.fasterxml.jackson.core.*;
5+
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
6+
import com.fasterxml.jackson.core.JsonParser;
7+
import com.fasterxml.jackson.core.JsonToken;
88
import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufField;
99
import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufMessage;
1010

11-
import junit.framework.TestCase;
12-
13-
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
11+
import static org.junit.jupiter.api.Assertions.fail;
1412

15-
public abstract class ProtobufTestBase extends TestCase
13+
public abstract class ProtobufTestBase
1614
{
1715
/*
1816
/**********************************************************

‎protobuf/src/test/java/com/fasterxml/jackson/dataformat/protobuf/ReadComplexPojoTest.java‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@
33
import java.io.ByteArrayInputStream;
44
import java.io.InputStream;
55

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

88
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
9-
import com.fasterxml.jackson.databind.*;
9+
import com.fasterxml.jackson.databind.ObjectReader;
10+
import com.fasterxml.jackson.databind.ObjectWriter;
1011
import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufSchema;
1112
import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufSchemaLoader;
1213
import com.fasterxml.jackson.dataformat.protobuf.testutil.LimitingInputStream;
1314

15+
import static org.junit.jupiter.api.Assertions.*;
16+
1417
public class ReadComplexPojoTest extends ProtobufTestBase
1518
{
1619
@JsonPropertyOrder({ "b", "i", "l", "d" })
@@ -42,11 +45,13 @@ public PojoWithArrays(boolean[] b,
4245

4346
final ProtobufMapper MAPPER = new ProtobufMapper();
4447

48+
@Test
4549
public void testMediaItemSimple() throws Exception
4650
{
4751
_testMediaItem(false);
4852
}
4953

54+
@Test
5055
public void testMediaItemWithSmallReads() throws Exception
5156
{
5257
_testMediaItem(true);
@@ -76,11 +81,12 @@ private void _testMediaItem(boolean smallReads) throws Exception
7681
byte[] b2 = w.writeValueAsBytes(result);
7782
assertEquals(bytes.length, b2.length);
7883

79-
Assert.assertArrayEquals(bytes, b2);
84+
assertArrayEquals(bytes, b2);
8085

8186
assertEquals(input, result);
8287
}
8388

89+
@Test
8490
public void testPojoWithArrays() throws Exception
8591
{
8692
_testPojoWithArrays(false);
@@ -114,9 +120,9 @@ private void _testPojoWithArrays(boolean smallReads) throws Exception
114120
PojoWithArrays result = r.readValue(in);
115121

116122
assertNotNull(result);
117-
Assert.assertArrayEquals(input.i, result.i);
118-
Assert.assertArrayEquals(input.l, result.l);
119-
Assert.assertArrayEquals(input.b, result.b);
123+
assertArrayEquals(input.i, result.i);
124+
assertArrayEquals(input.l, result.l);
125+
assertArrayEquals(input.b, result.b);
120126
assertEquals(input.d.length, result.d.length);
121127
for (int ix = 0; ix < input.d.length; ++ix) {
122128
assertEquals(input.d[ix], result.d[ix]);
@@ -126,7 +132,7 @@ private void _testPojoWithArrays(boolean smallReads) throws Exception
126132
byte[] b2 = w.writeValueAsBytes(result);
127133
assertEquals(bytes.length, b2.length);
128134

129-
Assert.assertArrayEquals(bytes, b2);
135+
assertArrayEquals(bytes, b2);
130136

131137
// and then see what happens if empty arrays are passed; expecting empty
132138
// (all fields missing, since zero-length arrays can not be represented)

0 commit comments

Comments
 (0)