Skip to content

File tree

3 files changed

+27
-48
lines changed

3 files changed

+27
-48
lines changed

src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/byAnnotation/specifiedForProperty/NonNullObjectTest.kt

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,50 +5,43 @@ import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
55
import com.fasterxml.jackson.module.kotlin.readValue
66
import com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NonNullObject
77
import org.junit.Assert.assertEquals
8-
import org.junit.Ignore
9-
import org.junit.experimental.runners.Enclosed
10-
import org.junit.runner.RunWith
8+
import org.junit.jupiter.api.Nested
119
import org.junit.jupiter.api.Test
1210

13-
@RunWith(Enclosed::class)
1411
class NonNullObjectTest {
15-
@Ignore
1612
companion object {
1713
val mapper = jacksonObjectMapper()
1814
}
1915

20-
@Ignore
2116
data class NonNull(
2217
@get:JsonDeserialize(using = NonNullObject.Deserializer::class)
2318
val getterAnn: NonNullObject,
2419
@field:JsonDeserialize(using = NonNullObject.Deserializer::class)
2520
val fieldAnn: NonNullObject
2621
)
2722

28-
class NonNullTest {
29-
@Test
30-
fun nonNull() {
31-
val result = mapper.readValue<NonNull>(
32-
"""
23+
@Test
24+
fun nonNull() {
25+
val result = mapper.readValue<NonNull>(
26+
"""
3327
{
3428
"getterAnn" : "foo",
3529
"fieldAnn" : "bar"
3630
}
3731
""".trimIndent()
38-
)
39-
assertEquals(NonNull(NonNullObject("foo-deser"), NonNullObject("bar-deser")), result)
40-
}
32+
)
33+
assertEquals(NonNull(NonNullObject("foo-deser"), NonNullObject("bar-deser")), result)
4134
}
4235

43-
@Ignore
4436
data class Nullable(
4537
@get:JsonDeserialize(using = NonNullObject.Deserializer::class)
4638
val getterAnn: NonNullObject?,
4739
@field:JsonDeserialize(using = NonNullObject.Deserializer::class)
4840
val fieldAnn: NonNullObject?
4941
)
5042

51-
class NullableTest {
43+
@Nested
44+
inner class NullableTest {
5245
@Test
5346
fun nonNullInput() {
5447
val result = mapper.readValue<Nullable>(

src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/byAnnotation/specifiedForProperty/NullableObjectTest.kt

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,50 +5,43 @@ import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
55
import com.fasterxml.jackson.module.kotlin.readValue
66
import com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NullableObject
77
import org.junit.Assert.assertEquals
8-
import org.junit.Ignore
9-
import org.junit.experimental.runners.Enclosed
10-
import org.junit.runner.RunWith
8+
import org.junit.jupiter.api.Nested
119
import org.junit.jupiter.api.Test
1210

13-
@RunWith(Enclosed::class)
1411
class NullableObjectTest {
15-
@Ignore
1612
companion object {
1713
val mapper = jacksonObjectMapper()
1814
}
1915

20-
@Ignore
2116
data class NonNull(
2217
@get:JsonDeserialize(using = NullableObject.DeserializerWrapsNullable::class)
2318
val getterAnn: NullableObject,
2419
@field:JsonDeserialize(using = NullableObject.DeserializerWrapsNullable::class)
2520
val fieldAnn: NullableObject
2621
)
2722

28-
class NonNullTest {
29-
@Test
30-
fun nonNull() {
31-
val result = mapper.readValue<NonNull>(
32-
"""
23+
@Test
24+
fun nonNull() {
25+
val result = mapper.readValue<NonNull>(
26+
"""
3327
{
3428
"getterAnn" : "foo",
3529
"fieldAnn" : "bar"
3630
}
3731
""".trimIndent()
38-
)
39-
assertEquals(NonNull(NullableObject("foo-deser"), NullableObject("bar-deser")), result)
40-
}
32+
)
33+
assertEquals(NonNull(NullableObject("foo-deser"), NullableObject("bar-deser")), result)
4134
}
4235

43-
@Ignore
4436
data class Nullable(
4537
@get:JsonDeserialize(using = NullableObject.DeserializerWrapsNullable::class)
4638
val getterAnn: NullableObject?,
4739
@field:JsonDeserialize(using = NullableObject.DeserializerWrapsNullable::class)
4840
val fieldAnn: NullableObject?
4941
)
5042

51-
class NullableTest {
43+
@Nested
44+
inner class NullableTest {
5245
@Test
5346
fun nonNullInput() {
5447
val result = mapper.readValue<Nullable>(

src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/byAnnotation/specifiedForProperty/PrimitiveTest.kt

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,50 +5,43 @@ import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
55
import com.fasterxml.jackson.module.kotlin.readValue
66
import com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.Primitive
77
import org.junit.Assert.assertEquals
8-
import org.junit.experimental.runners.Enclosed
9-
import org.junit.runner.RunWith
10-
import kotlin.test.Ignore
8+
import org.junit.jupiter.api.Nested
119
import org.junit.jupiter.api.Test
1210

13-
@RunWith(Enclosed::class)
1411
class PrimitiveTest {
15-
@Ignore
1612
companion object {
1713
val mapper = jacksonObjectMapper()
1814
}
1915

20-
@Ignore
2116
data class NonNull(
2217
@get:JsonDeserialize(using = Primitive.Deserializer::class)
2318
val getterAnn: Primitive,
2419
@field:JsonDeserialize(using = Primitive.Deserializer::class)
2520
val fieldAnn: Primitive
2621
)
2722

28-
class NonNullTest {
29-
@Test
30-
fun nonNull() {
31-
val result = mapper.readValue<NonNull>(
32-
"""
23+
@Test
24+
fun nonNull() {
25+
val result = mapper.readValue<NonNull>(
26+
"""
3327
{
3428
"getterAnn" : 1,
3529
"fieldAnn" : 2
3630
}
3731
""".trimIndent()
38-
)
39-
assertEquals(NonNull(Primitive(101), Primitive(102)), result)
40-
}
32+
)
33+
assertEquals(NonNull(Primitive(101), Primitive(102)), result)
4134
}
4235

43-
@Ignore
4436
data class Nullable(
4537
@get:JsonDeserialize(using = Primitive.Deserializer::class)
4638
val getterAnn: Primitive?,
4739
@field:JsonDeserialize(using = Primitive.Deserializer::class)
4840
val fieldAnn: Primitive?
4941
)
5042

51-
class NullableTest {
43+
@Nested
44+
inner class NullableTest {
5245
@Test
5346
fun nonNullInput() {
5447
val result = mapper.readValue<Nullable>(

0 commit comments

Comments
 (0)