Skip to content

Commit 3908c6d

Browse files
committed
Migrate tests to JUnit 5
1 parent 26b5e2a commit 3908c6d

Some content is hidden

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

41 files changed

+64
-66
lines changed

ion/src/test/java/com/fasterxml/jackson/dataformat/ion/DataBindReadTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import java.io.*;
1818

19-
import org.junit.Test;
19+
import org.junit.jupiter.api.Test;
2020

2121
import com.fasterxml.jackson.annotation.JsonIgnore;
2222
import com.fasterxml.jackson.databind.ObjectMapper;

ion/src/test/java/com/fasterxml/jackson/dataformat/ion/DataBindRoundtripTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import java.util.Collections;
2828
import java.util.List;
2929

30-
import org.junit.Test;
30+
import org.junit.jupiter.api.Test;
3131

3232
import com.fasterxml.jackson.annotation.JsonCreator;
3333
import com.fasterxml.jackson.annotation.JsonProperty;

ion/src/test/java/com/fasterxml/jackson/dataformat/ion/DataBindWriteTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
import com.amazon.ion.system.IonSystemBuilder;
2727
import com.amazon.ion.system.IonTextWriterBuilder;
2828
import com.amazon.ion.system.IonWriterBuilder;
29-
import org.junit.Before;
30-
import org.junit.Test;
29+
import org.junit.jupiter.api.BeforeEach;
30+
import org.junit.jupiter.api.Test;
3131

3232
import java.io.ByteArrayOutputStream;
3333
import java.io.IOException;
@@ -47,7 +47,7 @@ static class MyBean {
4747
IonSystem ion = IonSystemBuilder.standard().build();
4848
IonDatagram expectedMyBean;
4949

50-
@Before
50+
@BeforeEach
5151
public void initializeExpectedMyBean() {
5252
expectedMyBean = ion.newDatagram();
5353
IonStruct struct = ion.newEmptyStruct();
@@ -61,7 +61,7 @@ public void initializeExpectedMyBean() {
6161

6262
IonDatagram expectedArray;
6363

64-
@Before
64+
@BeforeEach
6565
public void initializeExpectedArray() {
6666
expectedArray = ion.newDatagram();
6767
IonList list = ion.newEmptyList();

ion/src/test/java/com/fasterxml/jackson/dataformat/ion/DatabindNumberRoundtrip490Test.java

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

33
import java.util.*;
4-
import org.junit.Test;
4+
import org.junit.jupiter.api.Test;
55

66
import com.fasterxml.jackson.databind.ObjectMapper;
77

ion/src/test/java/com/fasterxml/jackson/dataformat/ion/DatabindRead303Test.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import java.net.URL;
44

5-
import org.junit.Test;
5+
import org.junit.jupiter.api.Test;
66

77
import com.fasterxml.jackson.core.exc.StreamReadException;
88

ion/src/test/java/com/fasterxml/jackson/dataformat/ion/EnumAsIonSymbolSerializationTest.java

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

1515
package com.fasterxml.jackson.dataformat.ion;
1616

17-
import org.junit.Assert;
18-
import org.junit.Test;
17+
import static org.junit.jupiter.api.Assertions.*;
18+
import org.junit.jupiter.api.Test;
1919
import com.amazon.ion.IonSystem;
2020
import com.amazon.ion.IonValue;
2121
import com.amazon.ion.system.IonSystemBuilder;

ion/src/test/java/com/fasterxml/jackson/dataformat/ion/GenerateSexpTest.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@
1818
import java.io.IOException;
1919
import java.util.Arrays;
2020

21-
import org.junit.Assert;
22-
import org.junit.Before;
23-
import org.junit.Test;
21+
import org.junit.jupiter.api.BeforeEach;
22+
import org.junit.jupiter.api.Test;
2423

2524
import com.amazon.ion.IonSystem;
2625
import com.amazon.ion.IonWriter;
@@ -38,7 +37,7 @@ public class GenerateSexpTest {
3837
private IonSystem ionSystem;
3938
private IonObjectMapper mapper;
4039

41-
@Before
40+
@BeforeEach
4241
public void setup() {
4342
this.ionSystem = IonSystemBuilder.standard().build();
4443
this.mapper = IonObjectMapper.builder(ionSystem).build();

ion/src/test/java/com/fasterxml/jackson/dataformat/ion/IonFactoryTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.amazon.ion.IonReader;
44
import com.fasterxml.jackson.core.JsonParser;
5-
import org.junit.Test;
5+
import org.junit.jupiter.api.Test;
66

77
import java.io.ByteArrayInputStream;
88
import java.io.StringReader;

ion/src/test/java/com/fasterxml/jackson/dataformat/ion/IonGeneratorTest.java

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

1515
package com.fasterxml.jackson.dataformat.ion;
1616

17-
import org.junit.Test;
18-
import org.junit.Before;
17+
import org.junit.jupiter.api.Test;
18+
import org.junit.jupiter.api.BeforeEach;
1919
import com.fasterxml.jackson.core.JsonGenerationException;
2020
import com.fasterxml.jackson.databind.JsonNode;
2121

@@ -59,7 +59,7 @@ public class IonGeneratorTest {
5959
private IonValue testObjectIon;
6060
private JsonNode testObjectTree;
6161

62-
@Before
62+
@BeforeEach
6363
public void setUp() throws Exception {
6464
final IonFactory factory = new IonFactory();
6565

ion/src/test/java/com/fasterxml/jackson/dataformat/ion/IonNumberOverflowTest.java

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

33
import org.hamcrest.Matchers;
4-
import org.junit.Test;
4+
import org.junit.jupiter.api.Test;
55

66
import com.fasterxml.jackson.core.exc.InputCoercionException;
77

0 commit comments

Comments
 (0)