diff options
Diffstat (limited to 'src/test/java/com/fasterxml/jackson/databind')
-rw-r--r-- | src/test/java/com/fasterxml/jackson/databind/deser/CyclicTypesDeserTest.java (renamed from src/test/java/com/fasterxml/jackson/databind/deser/TestCyclicTypes.java) | 10 | ||||
-rw-r--r-- | src/test/java/com/fasterxml/jackson/databind/ser/CyclicTypeSerTest.java (renamed from src/test/java/com/fasterxml/jackson/databind/ser/TestCyclicTypes.java) | 15 | ||||
-rw-r--r-- | src/test/java/com/fasterxml/jackson/databind/ser/FieldSerializationTest.java | 2 |
3 files changed, 8 insertions, 19 deletions
diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/TestCyclicTypes.java b/src/test/java/com/fasterxml/jackson/databind/deser/CyclicTypesDeserTest.java index a2fb72975..5c26c353d 100644 --- a/src/test/java/com/fasterxml/jackson/databind/deser/TestCyclicTypes.java +++ b/src/test/java/com/fasterxml/jackson/databind/deser/CyclicTypesDeserTest.java @@ -9,15 +9,9 @@ import com.fasterxml.jackson.databind.*; * is not cyclic. This is the case for directed hierarchies like * trees and DAGs. */ -public class TestCyclicTypes +public class CyclicTypesDeserTest extends BaseMapTest { - /* - /********************************************************** - /* Helper bean classes - /********************************************************** - */ - static class Bean { Bean _next; @@ -63,7 +57,7 @@ public class TestCyclicTypes /********************************************************** */ - private final ObjectMapper MAPPER = objectMapper(); + private final ObjectMapper MAPPER = newJsonMapper(); public void testLinked() throws Exception { diff --git a/src/test/java/com/fasterxml/jackson/databind/ser/TestCyclicTypes.java b/src/test/java/com/fasterxml/jackson/databind/ser/CyclicTypeSerTest.java index 616fbafe1..d6cdf2756 100644 --- a/src/test/java/com/fasterxml/jackson/databind/ser/TestCyclicTypes.java +++ b/src/test/java/com/fasterxml/jackson/databind/ser/CyclicTypeSerTest.java @@ -11,15 +11,9 @@ import com.fasterxml.jackson.databind.*; * is not cyclic. This is the case for directed hierarchies like * trees and DAGs. */ -public class TestCyclicTypes +public class CyclicTypeSerTest extends BaseMapTest { - /* - /********************************************************** - /* Helper bean classes - /********************************************************** - */ - static class Bean { Bean _next; @@ -42,11 +36,13 @@ public class TestCyclicTypes /********************************************************** */ + private final ObjectMapper MAPPER = newJsonMapper(); + public void testLinked() throws Exception { Bean last = new Bean(null, "last"); Bean first = new Bean(last, "first"); - Map<String,Object> map = writeAndMap(new ObjectMapper(), first); + Map<String,Object> map = writeAndMap(MAPPER, first); assertEquals(2, map.size()); assertEquals("first", map.get("name")); @@ -67,10 +63,9 @@ public class TestCyclicTypes Bean selfRef = new Bean(null, "self-refs"); Bean first = new Bean(selfRef, "first"); selfRef.assignNext(selfRef); - ObjectMapper m = new ObjectMapper(); Bean[] wrapper = new Bean[] { first }; try { - writeAndMap(m, wrapper); + writeAndMap(MAPPER, wrapper); } catch (JsonMappingException e) { verifyException(e, "Direct self-reference leading to cycle"); } diff --git a/src/test/java/com/fasterxml/jackson/databind/ser/FieldSerializationTest.java b/src/test/java/com/fasterxml/jackson/databind/ser/FieldSerializationTest.java index ee4068c9d..ddcc661af 100644 --- a/src/test/java/com/fasterxml/jackson/databind/ser/FieldSerializationTest.java +++ b/src/test/java/com/fasterxml/jackson/databind/ser/FieldSerializationTest.java @@ -131,7 +131,7 @@ public class FieldSerializationTest /********************************************************** */ - private final ObjectMapper MAPPER = new ObjectMapper(); + private final ObjectMapper MAPPER = newJsonMapper(); public void testSimpleAutoDetect() throws Exception { |