@@ -7,15 +7,10 @@ import com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.No
77import com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NullableObject
88import com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.Primitive
99import org.junit.Assert.assertEquals
10- import org.junit.Assert.assertThrows
11- import org.junit.Ignore
12- import org.junit.experimental.runners.Enclosed
13- import org.junit.runner.RunWith
10+ import org.junit.jupiter.api.Nested
1411import org.junit.jupiter.api.Test
1512
16- @RunWith(Enclosed ::class )
1713class SpecifiedForObjectMapperTest {
18- @Ignore
1914 companion object {
2015 val mapper = jacksonObjectMapper().apply {
2116 val module = SimpleModule ().apply {
@@ -27,7 +22,8 @@ class SpecifiedForObjectMapperTest {
2722 }
2823 }
2924
30- class DirectDeserialize {
25+ @Nested
26+ inner class DirectDeserialize {
3127 @Test
3228 fun primitive () {
3329 val result = mapper.readValue<Primitive >(" 1" )
@@ -41,7 +37,8 @@ class SpecifiedForObjectMapperTest {
4137 }
4238
4339 @Suppress(" ClassName" )
44- class NullableObject_ {
40+ @Nested
41+ inner class NullableObject_ {
4542 @Test
4643 fun value () {
4744 val result = mapper.readValue<NullableObject >(""" "foo"""" )
@@ -51,16 +48,14 @@ class SpecifiedForObjectMapperTest {
5148 // failing
5249 @Test
5350 fun nullString () {
54- // #209 has been fixed.
55- assertThrows(NullPointerException ::class .java) {
51+ org.junit.jupiter.api.assertThrows<NullPointerException >(" #209 has been fixed." ) {
5652 val result = mapper.readValue<NullableObject >(" null" )
5753 assertEquals(NullableObject (" null-value-deser" ), result)
5854 }
5955 }
6056 }
6157 }
6258
63- @Ignore
6459 data class Dst (
6560 val pNn : Primitive ,
6661 val pN : Primitive ? ,
@@ -70,53 +65,51 @@ class SpecifiedForObjectMapperTest {
7065 val noN : NullableObject ?
7166 )
7267
73- class InParameterDeserialize {
74- @Test
75- fun nonNull () {
76- val base = Dst (
77- Primitive (1 ),
78- Primitive (2 ),
79- NonNullObject (" foo" ),
80- NonNullObject (" bar" ),
81- NullableObject (" baz" ),
82- NullableObject (" qux" )
83- )
84- val src = mapper.writeValueAsString(base)
85- val result = mapper.readValue<Dst >(src)
68+ @Test
69+ fun nonNull () {
70+ val base = Dst (
71+ Primitive (1 ),
72+ Primitive (2 ),
73+ NonNullObject (" foo" ),
74+ NonNullObject (" bar" ),
75+ NullableObject (" baz" ),
76+ NullableObject (" qux" )
77+ )
78+ val src = mapper.writeValueAsString(base)
79+ val result = mapper.readValue<Dst >(src)
8680
87- val expected = Dst (
88- Primitive (101 ),
89- Primitive (102 ),
90- NonNullObject (" foo-deser" ),
91- NonNullObject (" bar-deser" ),
92- NullableObject (" baz-deser" ),
93- NullableObject (" qux-deser" )
94- )
95- assertEquals(expected, result)
96- }
81+ val expected = Dst (
82+ Primitive (101 ),
83+ Primitive (102 ),
84+ NonNullObject (" foo-deser" ),
85+ NonNullObject (" bar-deser" ),
86+ NullableObject (" baz-deser" ),
87+ NullableObject (" qux-deser" )
88+ )
89+ assertEquals(expected, result)
90+ }
9791
98- @Test
99- fun withNull () {
100- val base = Dst (
101- Primitive (1 ),
102- null ,
103- NonNullObject (" foo" ),
104- null ,
105- NullableObject (null ),
106- null
107- )
108- val src = mapper.writeValueAsString(base)
109- val result = mapper.readValue<Dst >(src)
92+ @Test
93+ fun withNull () {
94+ val base = Dst (
95+ Primitive (1 ),
96+ null ,
97+ NonNullObject (" foo" ),
98+ null ,
99+ NullableObject (null ),
100+ null
101+ )
102+ val src = mapper.writeValueAsString(base)
103+ val result = mapper.readValue<Dst >(src)
110104
111- val expected = Dst (
112- Primitive (101 ),
113- null ,
114- NonNullObject (" foo-deser" ),
115- null ,
116- NullableObject (" null-value-deser" ),
117- null
118- )
119- assertEquals(expected, result)
120- }
105+ val expected = Dst (
106+ Primitive (101 ),
107+ null ,
108+ NonNullObject (" foo-deser" ),
109+ null ,
110+ NullableObject (" null-value-deser" ),
111+ null
112+ )
113+ assertEquals(expected, result)
121114 }
122115}
0 commit comments