Skip to content

Commit 48a1a2c

Browse files
timo-atimo-a
authored
update(tests, failing): migrate tests in /failing to JUnit5 (#4448)
1 parent 2161d24 commit 48a1a2c

File tree

47 files changed

+915
-800
lines changed

Some content is hidden

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

47 files changed

+915
-800
lines changed

‎src/test/java/com/fasterxml/jackson/databind/testutil/DatabindTestUtil.java

+15
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,10 @@ public static ObjectMapper sharedMapper() {
327327
return SHARED_MAPPER;
328328
}
329329

330+
protected ObjectMapper objectMapper() {
331+
return sharedMapper();
332+
}
333+
330334
protected static ObjectWriter objectWriter() {
331335
return sharedMapper().writer();
332336
}
@@ -416,6 +420,17 @@ public static void assertToken(JsonToken expToken, JsonParser jp)
416420
assertToken(expToken, jp.currentToken());
417421
}
418422

423+
protected void assertType(Object ob, Class<?> expType)
424+
{
425+
if (ob == null) {
426+
fail("Expected an object of type "+expType.getName()+", got null");
427+
}
428+
Class<?> cls = ob.getClass();
429+
if (!expType.isAssignableFrom(cls)) {
430+
fail("Expected type "+expType.getName()+", got "+cls.getName());
431+
}
432+
}
433+
419434
/**
420435
* @param e Exception to check
421436
* @param anyMatches Array of Strings of which AT LEAST ONE ("any") has to be included

‎src/test/java/com/fasterxml/jackson/failing/AnyGetterSorting518Test.java

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
package com.fasterxml.jackson.failing;
22

3-
import java.util.HashMap;
4-
import java.util.LinkedHashMap;
5-
import java.util.Map;
6-
73
import com.fasterxml.jackson.annotation.JsonAnyGetter;
84
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
9-
10-
import com.fasterxml.jackson.databind.*;
5+
import com.fasterxml.jackson.databind.ObjectMapper;
116
import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
7+
import org.junit.jupiter.api.Test;
8+
9+
import java.util.HashMap;
10+
import java.util.LinkedHashMap;
11+
import java.util.Map;
1212

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

15-
public class AnyGetterSorting518Test extends DatabindTestUtil
15+
class AnyGetterSorting518Test extends DatabindTestUtil
1616
{
1717
@JsonPropertyOrder(alphabetic = true)
1818
static class Bean
@@ -41,7 +41,8 @@ public Bean(int a, int b, Map<String,Object> x) {
4141

4242
private final ObjectMapper MAPPER = new ObjectMapper();
4343

44-
public void testAnyBeanWithSort() throws Exception
44+
@Test
45+
void anyBeanWithSort() throws Exception
4546
{
4647
Map<String,Object> extra = new LinkedHashMap<>();
4748
extra.put("y", 4);

‎src/test/java/com/fasterxml/jackson/failing/AnySetterAsCreatorFallback1401Test.java

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
package com.fasterxml.jackson.failing;
22

3-
import com.fasterxml.jackson.annotation.*;
4-
5-
import com.fasterxml.jackson.databind.*;
3+
import com.fasterxml.jackson.annotation.JsonAnySetter;
4+
import com.fasterxml.jackson.annotation.JsonCreator;
5+
import com.fasterxml.jackson.annotation.JsonProperty;
6+
import com.fasterxml.jackson.databind.ObjectMapper;
67
import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
8+
import org.junit.jupiter.api.Test;
79

810
import static org.junit.jupiter.api.Assertions.assertEquals;
911

1012
// for [databind#1401]: should allow "Any Setter" to back up otherwise
1113
// problematic Creator properties?
12-
public class AnySetterAsCreatorFallback1401Test extends DatabindTestUtil
14+
class AnySetterAsCreatorFallback1401Test extends DatabindTestUtil
1315
{
1416
// for [databind#1401]
1517
static class NoSetter1401 {
@@ -33,7 +35,8 @@ public void any(String key, Object value) { }
3335
private final ObjectMapper MAPPER = newJsonMapper();
3436

3537
// [databind#1401]
36-
public void testCreatorNoSetter() throws Exception
38+
@Test
39+
void creatorNoSetter() throws Exception
3740
{
3841
NoSetter1401 b = MAPPER.readValue(a2q("{'a':1,'b':2}"),
3942
NoSetter1401.class);

‎src/test/java/com/fasterxml/jackson/failing/AnySetterForCreator562Test.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
package com.fasterxml.jackson.failing;
22

3-
import java.util.Collections;
4-
import java.util.Map;
5-
3+
import com.fasterxml.jackson.annotation.JsonAnySetter;
4+
import com.fasterxml.jackson.annotation.JsonCreator;
5+
import com.fasterxml.jackson.annotation.JsonProperty;
6+
import com.fasterxml.jackson.databind.ObjectMapper;
7+
import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
68
import org.junit.jupiter.api.Test;
79

8-
import com.fasterxml.jackson.annotation.*;
9-
10-
import com.fasterxml.jackson.databind.*;
11-
import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
10+
import java.util.Collections;
11+
import java.util.Map;
1212

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

15-
public class AnySetterForCreator562Test extends DatabindTestUtil
15+
class AnySetterForCreator562Test extends DatabindTestUtil
1616
{
1717
// [databind#562]
1818
static class POJO562
@@ -34,13 +34,13 @@ public POJO562(@JsonProperty("a") String a,
3434

3535
// [databind#562]
3636
@Test
37-
public void testAnySetterViaCreator562() throws Exception
37+
void anySetterViaCreator562() throws Exception
3838
{
3939
POJO562 pojo = MAPPER.readValue(a2q(
4040
"{'a':'value', 'b':42}"
4141
),
4242
POJO562.class);
43-
assertEquals(pojo.a, "value");
43+
assertEquals("value", pojo.a);
4444
assertEquals(Collections.singletonMap("b", Integer.valueOf(42)),
4545
pojo.stuff);
4646
}

‎src/test/java/com/fasterxml/jackson/failing/AsEmptyPOJONoDefaultCtor2572Test.java

+11-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
package com.fasterxml.jackson.failing;
22

3-
import java.util.Objects;
4-
5-
import com.fasterxml.jackson.annotation.*;
3+
import com.fasterxml.jackson.annotation.JsonCreator;
4+
import com.fasterxml.jackson.annotation.JsonProperty;
5+
import com.fasterxml.jackson.annotation.JsonSetter;
6+
import com.fasterxml.jackson.annotation.Nulls;
7+
import com.fasterxml.jackson.databind.ObjectMapper;
8+
import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
9+
import org.junit.jupiter.api.Test;
610

7-
import com.fasterxml.jackson.databind.*;
11+
import java.util.Objects;
812

913
// [databind#2572]: "empty" setter, POJO with no 0-arg constructor
10-
public class AsEmptyPOJONoDefaultCtor2572Test extends BaseMapTest
11-
{
14+
class AsEmptyPOJONoDefaultCtor2572Test extends DatabindTestUtil {
1215
static class Outer {
1316
@JsonProperty("inner")
1417
private final Inner inner;
@@ -29,7 +32,8 @@ public Inner(@JsonProperty("field") String field) {
2932
}
3033
}
3134

32-
public void testJackson() throws Exception {
35+
@Test
36+
void jackson() throws Exception {
3337
ObjectMapper mapper = new ObjectMapper()
3438
.setDefaultSetterInfo(JsonSetter.Value.construct(Nulls.AS_EMPTY, Nulls.AS_EMPTY));
3539
final String json = mapper.writeValueAsString(new Outer(new Inner("inner")));

‎src/test/java/com/fasterxml/jackson/failing/BackReference1516Test.java

+25-30
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,41 @@
11
package com.fasterxml.jackson.failing;
22

3+
import com.fasterxml.jackson.annotation.JsonBackReference;
4+
import com.fasterxml.jackson.annotation.JsonManagedReference;
5+
import com.fasterxml.jackson.databind.ObjectMapper;
6+
import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
7+
import org.junit.jupiter.api.Test;
8+
39
import java.beans.ConstructorProperties;
410

5-
import com.fasterxml.jackson.annotation.*;
11+
import static org.junit.jupiter.api.Assertions.assertNotNull;
12+
import static org.junit.jupiter.api.Assertions.assertSame;
613

7-
import com.fasterxml.jackson.databind.BaseMapTest;
8-
import com.fasterxml.jackson.databind.ObjectMapper;
9-
10-
public class BackReference1516Test extends BaseMapTest
11-
{
14+
class BackReference1516Test extends DatabindTestUtil {
1215
static class ParentWithCreator {
1316
String id, name;
1417

1518
@JsonManagedReference
1619
ChildObject1 child;
1720

18-
@ConstructorProperties({ "id", "name", "child" })
21+
@ConstructorProperties({"id", "name", "child"})
1922
public ParentWithCreator(String id, String name,
20-
ChildObject1 child) {
23+
ChildObject1 child) {
2124
this.id = id;
2225
this.name = name;
2326
this.child = child;
2427
}
2528
}
2629

27-
static class ChildObject1
28-
{
30+
static class ChildObject1 {
2931
public String id, name;
3032

3133
@JsonBackReference
3234
public ParentWithCreator parent;
3335

34-
@ConstructorProperties({ "id", "name", "parent" })
36+
@ConstructorProperties({"id", "name", "parent"})
3537
public ChildObject1(String id, String name,
36-
ParentWithCreator parent) {
38+
ParentWithCreator parent) {
3739
this.id = id;
3840
this.name = name;
3941
this.parent = parent;
@@ -47,47 +49,40 @@ static class ParentWithoutCreator {
4749
public ChildObject2 child;
4850
}
4951

50-
static class ChildObject2
51-
{
52+
static class ChildObject2 {
5253
public String id, name;
5354

5455
@JsonBackReference
5556
public ParentWithoutCreator parent;
5657

57-
@ConstructorProperties({ "id", "name", "parent" })
58+
@ConstructorProperties({"id", "name", "parent"})
5859
public ChildObject2(String id, String name,
59-
ParentWithoutCreator parent) {
60+
ParentWithoutCreator parent) {
6061
this.id = id;
6162
this.name = name;
6263
this.parent = parent;
6364
}
6465
}
6566

66-
/*
67-
/**********************************************************
68-
/* Test methods
69-
/**********************************************************
70-
*/
71-
7267
private final ObjectMapper MAPPER = newJsonMapper();
7368

7469
private final String PARENT_CHILD_JSON = a2q(
75-
"{ 'id': 'abc',\n"+
76-
" 'name': 'Bob',\n"+
77-
" 'child': { 'id': 'def', 'name':'Bert' }\n"+
78-
"}");
70+
"{ 'id': 'abc',\n" +
71+
" 'name': 'Bob',\n" +
72+
" 'child': { 'id': 'def', 'name':'Bert' }\n" +
73+
"}");
7974

80-
public void testWithParentCreator() throws Exception
81-
{
75+
@Test
76+
void withParentCreator() throws Exception {
8277
ParentWithCreator result = MAPPER.readValue(PARENT_CHILD_JSON,
8378
ParentWithCreator.class);
8479
assertNotNull(result);
8580
assertNotNull(result.child);
8681
assertSame(result, result.child.parent);
8782
}
8883

89-
public void testWithParentNoCreator() throws Exception
90-
{
84+
@Test
85+
void withParentNoCreator() throws Exception {
9186
ParentWithoutCreator result = MAPPER.readValue(PARENT_CHILD_JSON,
9287
ParentWithoutCreator.class);
9388
assertNotNull(result);

‎src/test/java/com/fasterxml/jackson/failing/BeanDeserializerModifier4356Test.java

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,25 @@
11
package com.fasterxml.jackson.failing;
22

3-
import java.io.IOException;
4-
import java.util.Iterator;
5-
6-
import org.junit.jupiter.api.Test;
7-
83
import com.fasterxml.jackson.annotation.JsonCreator;
94
import com.fasterxml.jackson.annotation.JsonProperty;
10-
11-
import com.fasterxml.jackson.core.*;
12-
5+
import com.fasterxml.jackson.core.JsonParser;
6+
import com.fasterxml.jackson.core.JsonProcessingException;
137
import com.fasterxml.jackson.databind.*;
148
import com.fasterxml.jackson.databind.deser.BeanDeserializerBuilder;
159
import com.fasterxml.jackson.databind.deser.BeanDeserializerModifier;
1610
import com.fasterxml.jackson.databind.deser.SettableBeanProperty;
1711
import com.fasterxml.jackson.databind.module.SimpleModule;
1812
import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
13+
import org.junit.jupiter.api.Test;
14+
15+
import java.io.IOException;
16+
import java.util.Iterator;
1917

2018
import static org.junit.jupiter.api.Assertions.assertEquals;
2119

2220
// [databind#4356]
23-
public class BeanDeserializerModifier4356Test
24-
extends DatabindTestUtil
21+
class BeanDeserializerModifier4356Test
22+
extends DatabindTestUtil
2523
{
2624
static class MutableBean4356 {
2725
String a;
@@ -76,16 +74,18 @@ public String deserialize(JsonParser p, DeserializationContext ctxt) throws IOEx
7674

7775
private final ObjectMapper MAPPER = jsonMapperBuilder().addModule(getSimpleModuleWithDeserializerModifier()).build();
7876

79-
@Test // passes
80-
public void testMutableBeanUpdateBuilder() throws JsonProcessingException {
77+
// passes
78+
@Test
79+
void mutableBeanUpdateBuilder() throws JsonProcessingException {
8180
MutableBean4356 recreatedBean = MAPPER.readValue("{\"a\": \"Some value\"}",
8281
MutableBean4356.class);
8382

8483
assertEquals(CUSTOM_DESERIALIZER_VALUE, recreatedBean.getA());
8584
}
8685

87-
@Test // Fails without fix
88-
public void testImmutableBeanUpdateBuilder() throws JsonProcessingException {
86+
// Fails without fix
87+
@Test
88+
void immutableBeanUpdateBuilder() throws JsonProcessingException {
8989
ImmutableBean4356 recreatedBean = MAPPER.readValue("{\"a\": \"Some value\"}",
9090
ImmutableBean4356.class);
9191

0 commit comments

Comments
 (0)