Skip to content

Commit b7ce302

Browse files
authored
Test refactoring: use "@JacksonTestFailureExpected" from jackson-core test artifact (#4910)
1 parent 799f77d commit b7ce302

File tree

44 files changed

+42
-144
lines changed

Some content is hidden

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

44 files changed

+42
-144
lines changed

src/test/java/module-info.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@
9595
opens tools.jackson.databind.ser.filter;
9696
opens tools.jackson.databind.seq;
9797
opens tools.jackson.databind.struct;
98-
opens tools.jackson.databind.testutil.failure;
9998
opens tools.jackson.databind.tofix;
10099
opens tools.jackson.databind.util.internal;
101100
opens tools.jackson.databind.views;

src/test/java/tools/jackson/databind/records/tofix/DuplicatePropertyDeserializationRecord4690Test.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
import org.junit.jupiter.api.Test;
44

5+
import tools.jackson.core.testutil.failure.JacksonTestFailureExpected;
6+
57
import tools.jackson.databind.ObjectMapper;
68
import tools.jackson.databind.testutil.DatabindTestUtil;
7-
import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected;
89

910
import static org.junit.jupiter.api.Assertions.assertEquals;
1011
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -14,7 +15,6 @@
1415
public class DuplicatePropertyDeserializationRecord4690Test
1516
extends DatabindTestUtil
1617
{
17-
1818
record MyRecord(String first) { }
1919

2020
private final ObjectMapper mapper = newJsonMapper();

src/test/java/tools/jackson/databind/records/tofix/RecordUpdate3079FailingTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import java.util.Collections;
44

55
import org.junit.jupiter.api.Test;
6+
import tools.jackson.core.testutil.failure.JacksonTestFailureExpected;
67

78
import tools.jackson.databind.*;
89
import tools.jackson.databind.testutil.DatabindTestUtil;
9-
import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected;
1010

1111
import static org.junit.jupiter.api.Assertions.*;
1212

src/test/java/tools/jackson/databind/records/tofix/RecordsWithJsonIncludeAndIgnorals4629Test.java

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

33
import org.junit.jupiter.api.Test;
44

5+
import tools.jackson.core.testutil.failure.JacksonTestFailureExpected;
6+
57
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
68
import com.fasterxml.jackson.annotation.JsonIncludeProperties;
79

810
import tools.jackson.databind.ObjectMapper;
911
import tools.jackson.databind.testutil.DatabindTestUtil;
10-
import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected;
1112

1213
import static org.junit.jupiter.api.Assertions.assertEquals;
1314

src/test/java/tools/jackson/databind/testutil/DatabindTestUtil.java

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

33
import java.io.*;
44
import java.lang.annotation.*;
5-
import java.nio.charset.StandardCharsets;
65
import java.util.*;
76

87
import tools.jackson.core.*;

src/test/java/tools/jackson/databind/testutil/failure/JacksonTestFailureExpected.java

Lines changed: 0 additions & 37 deletions
This file was deleted.

src/test/java/tools/jackson/databind/testutil/failure/JacksonTestFailureExpectedInterceptor.java

Lines changed: 0 additions & 45 deletions
This file was deleted.

src/test/java/tools/jackson/databind/testutil/failure/JacksonTestShouldFailException.java

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/test/java/tools/jackson/databind/tofix/AnyGetterSorting518Test.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
import java.util.Map;
66

77
import org.junit.jupiter.api.Test;
8+
import tools.jackson.core.testutil.failure.JacksonTestFailureExpected;
89

910
import com.fasterxml.jackson.annotation.JsonAnyGetter;
1011
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
1112

1213
import tools.jackson.databind.*;
1314
import tools.jackson.databind.testutil.DatabindTestUtil;
14-
import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected;
1515

1616
import static org.junit.jupiter.api.Assertions.assertEquals;
1717

src/test/java/tools/jackson/databind/tofix/AnySetterAsCreatorFallback1401Test.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package tools.jackson.databind.tofix;
22

33
import org.junit.jupiter.api.Test;
4+
import tools.jackson.core.testutil.failure.JacksonTestFailureExpected;
45

56
import com.fasterxml.jackson.annotation.JsonAnySetter;
67
import com.fasterxml.jackson.annotation.JsonCreator;
78
import com.fasterxml.jackson.annotation.JsonProperty;
89

910
import tools.jackson.databind.*;
1011
import tools.jackson.databind.testutil.DatabindTestUtil;
11-
import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected;
1212

1313
import static org.junit.jupiter.api.Assertions.assertEquals;
1414

0 commit comments

Comments
 (0)