Merge pull request #210 from ProjectMapK/tests

Add and organize tests for `value class`

Author: k163377

src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/NoSpecifiedTest.kt renamed to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/WithoutCustomDeserializeMethodTest.kt

@@ -1,19 +1,55 @@
 package io.github.projectmapk.jackson.module.kogera.zIntegration.deser.valueClass
 
+import io.github.projectmapk.jackson.module.kogera.defaultMapper
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
 import io.github.projectmapk.jackson.module.kogera.readValue
+import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Assertions.assertEquals
-import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
 import java.lang.reflect.InvocationTargetException
 
-class NoSpecifiedTest {
+class WithoutCustomDeserializeMethodTest {
     companion object {
         val mapper = jacksonObjectMapper()
         val throwable = IllegalArgumentException("test")
     }
 
+    @Nested
+    inner class DirectDeserializeTest {
+        @Test
+        fun primitive() {
+            val result = defaultMapper.readValue<Primitive>("1")
+            assertEquals(Primitive(1), result)
+        }
+
+        @Test
+        fun nonNullObject() {
+            val result = defaultMapper.readValue<NonNullObject>(""""foo"""")
+            assertEquals(NonNullObject("foo"), result)
+        }
+
+        @Suppress("ClassName")
+        @Nested
+        inner class NullableObject_ {
+            @Test
+            fun value() {
+                val result = defaultMapper.readValue<NullableObject>(""""foo"""")
+                assertEquals(NullableObject("foo"), result)
+            }
+
+            // failing
+            @Test
+            fun nullString() {
+                assertThrows<NullPointerException>("#209 has been fixed.") {
+                    val result = defaultMapper.readValue<NullableObject>("null")
+                    assertEquals(NullableObject(null), result)
+                }
+            }
+        }
+    }
+
     data class Dst(
         val pNn: Primitive,
         val pN: Primitive?,
@@ -24,7 +60,7 @@ class NoSpecifiedTest {
     )
 
     @Test
-    fun nonNull() {
+    fun withoutNull() {
         val expected = Dst(
             Primitive(1),
             Primitive(2),
@@ -56,15 +92,17 @@ class NoSpecifiedTest {
     }
 
     @JvmInline
-    value class HasCheck(val value: Int) {
+    value class HasCheckConstructor(val value: Int) {
         init {
             if (value < 0) throw throwable
         }
     }
 
     @Test
-    fun callCheckTest() {
-        val e = assertThrows<InvocationTargetException> { mapper.readValue<HasCheck>("-1") }
-        assertTrue(e.cause === throwable)
+    fun callConstructorCheckTest() {
+        val e = assertThrows<InvocationTargetException> { defaultMapper.readValue<HasCheckConstructor>("-1") }
+        Assertions.assertTrue(e.cause === throwable)
     }
+
+    // If all JsonCreator tests are OK, no need to check throws from factory functions.
 }

src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/deserializer/SpecifiedForObjectMapperTest.kt

@@ -7,7 +7,9 @@ import io.github.projectmapk.jackson.module.kogera.zIntegration.deser.valueClass
 import io.github.projectmapk.jackson.module.kogera.zIntegration.deser.valueClass.NullableObject
 import io.github.projectmapk.jackson.module.kogera.zIntegration.deser.valueClass.Primitive
 import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.assertThrows
 
 class SpecifiedForObjectMapperTest {
     companion object {
@@ -21,6 +23,40 @@ class SpecifiedForObjectMapperTest {
         }
     }
 
+    @Nested
+    inner class DirectDeserialize {
+        @Test
+        fun primitive() {
+            val result = mapper.readValue<Primitive>("1")
+            assertEquals(Primitive(101), result)
+        }
+
+        @Test
+        fun nonNullObject() {
+            val result = mapper.readValue<NonNullObject>(""""foo"""")
+            assertEquals(NonNullObject("foo-deser"), result)
+        }
+
+        @Suppress("ClassName")
+        @Nested
+        inner class NullableObject_ {
+            @Test
+            fun value() {
+                val result = mapper.readValue<NullableObject>(""""foo"""")
+                assertEquals(NullableObject("foo-deser"), result)
+            }
+
+            // failing
+            @Test
+            fun nullString() {
+                assertThrows<NullPointerException>("#209 has been fixed.") {
+                    val result = mapper.readValue<NullableObject>("null")
+                    assertEquals(NullableObject("null-value-deser"), result)
+                }
+            }
+        }
+    }
+
     data class Dst(
         val pNn: Primitive,
         val pN: Primitive?,

src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/jsonCreator/ValueClassByJacksonCreatorTest.kt renamed to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/jsonCreator/HandledByJacksonTest.kt

@@ -7,7 +7,7 @@ import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
 // Test for Creator that can be handled by the Jackson mechanism.
-class ValueClassByJacksonCreatorTest {
+class HandledByJacksonTest {
     @JvmInline
     value class PrimitiveNullableCreator(val value: Int) {
         companion object {

src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/jsonCreator/ValueClassByOriginalCreatorTest.kt renamed to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/jsonCreator/HandledByKogeraTest.kt

@@ -9,10 +9,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
 
 // Test on the case of deserialization by ValueClassBoxDeserializer
-class ValueClassByOriginalCreatorTest {
-    @JvmInline
-    value class Primary(val primary: String)
-
+class HandledByKogeraTest {
     @JvmInline
     value class SpecifiedPrimary @JsonCreator constructor(val primary: String?)
 
@@ -34,14 +31,12 @@ class ValueClassByOriginalCreatorTest {
     fun directDeserTest() {
         val mapper = jacksonObjectMapper()
 
-        assertEquals(Primary("a"), mapper.readValue<Primary>("\"a\""))
         assertEquals(SpecifiedPrimary("b"), mapper.readValue<SpecifiedPrimary>("\"b\""))
         assertEquals(Secondary("1-creator"), mapper.readValue<Secondary>("1"))
         assertEquals(Factory(101), mapper.readValue<Factory>("1"))
     }
 
     data class Dst(
-        val foo: Primary,
         val bar: SpecifiedPrimary,
         val baz: Secondary,
         val qux: Factory
@@ -54,7 +49,6 @@ class ValueClassByOriginalCreatorTest {
         val r = mapper.readValue<Dst>(
             """
             {
-              "foo":"a",
               "bar":"b",
               "baz":1,
               "qux":1
@@ -64,7 +58,6 @@ class ValueClassByOriginalCreatorTest {
 
         assertEquals(
             Dst(
-                Primary("a"),
                 SpecifiedPrimary("b"),
                 Secondary("1-creator"),
                 Factory(101)