Merge pull request #208 from ProjectMapK/value-param-size-test

Added parameter size test when `value class` is included as an argument

Author: k163377

src/test/kotlin/io/github/projectmapk/jackson/module/kogera/TestCommons.kt

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.util.DefaultPrettyPrinter
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.ObjectWriter
 import org.junit.jupiter.api.Assertions.assertEquals
+import kotlin.reflect.KParameter
 import kotlin.reflect.full.memberProperties
 import kotlin.reflect.full.primaryConstructor
 
@@ -19,10 +20,11 @@ internal fun Class<*>.isKotlinClass() = declaredAnnotations.any { it is Metadata
 
 internal val defaultMapper = jacksonObjectMapper()
 
-internal inline fun <reified T : Any> callPrimaryConstructorByParamName(): T = T::class.primaryConstructor!!.run {
-    val args = parameters.associateWith { it.name }
-    return callBy(args)
-}
+internal inline fun <reified T : Any> callPrimaryConstructor(mapper: (KParameter) -> Any? = { it.name }): T =
+    T::class.primaryConstructor!!.run {
+        val args = parameters.associateWith { mapper(it) }
+        callBy(args)
+    }
 
 // Function for comparing non-data classes.
 internal inline fun <reified T : Any> assertReflectEquals(expected: T, actual: T) {

src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/DeserializeByConstructorWithDefaultArgumentsTest.kt renamed to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/parameterSize/DeserializeByConstructorWithDefaultArgumentsTest.kt

@@ -1,9 +1,9 @@
-package io.github.projectmapk.jackson.module.kogera.zIntegration.deser
+package io.github.projectmapk.jackson.module.kogera.zIntegration.deser.parameterSize
 
 import io.github.projectmapk.jackson.module.kogera.assertReflectEquals
 import io.github.projectmapk.jackson.module.kogera.defaultMapper
 import io.github.projectmapk.jackson.module.kogera.readValue
-import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 
 /**
@@ -50,7 +50,7 @@ class DeserializeByConstructorWithDefaultArgumentsTest {
 
     @Test
     fun test32() {
-        assertEquals(Dst32(), defaultMapper.readValue<Dst32>("{}"))
+        Assertions.assertEquals(Dst32(), defaultMapper.readValue<Dst32>("{}"))
     }
 
     data class Dst33(
@@ -91,7 +91,7 @@ class DeserializeByConstructorWithDefaultArgumentsTest {
 
     @Test
     fun test33() {
-        assertEquals(Dst33(), defaultMapper.readValue<Dst33>("{}"))
+        Assertions.assertEquals(Dst33(), defaultMapper.readValue<Dst33>("{}"))
     }
 
     data class Dst64(
@@ -163,7 +163,7 @@ class DeserializeByConstructorWithDefaultArgumentsTest {
 
     @Test
     fun test64() {
-        assertEquals(Dst64(), defaultMapper.readValue<Dst64>("{}"))
+        Assertions.assertEquals(Dst64(), defaultMapper.readValue<Dst64>("{}"))
     }
 
     data class Dst65(
@@ -236,7 +236,7 @@ class DeserializeByConstructorWithDefaultArgumentsTest {
 
     @Test
     fun test65() {
-        assertEquals(Dst65(), defaultMapper.readValue<Dst65>("{}"))
+        Assertions.assertEquals(Dst65(), defaultMapper.readValue<Dst65>("{}"))
     }
 
     // It cannot be a data class because the generated method would exceed the argument size limit.

src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/DeserializeByConstructorWithoutDefaultArgumentsTest.kt renamed to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/parameterSize/DeserializeByConstructorWithoutDefaultArgumentsTest.kt

@@ -1,10 +1,10 @@
-package io.github.projectmapk.jackson.module.kogera.zIntegration.deser
+package io.github.projectmapk.jackson.module.kogera.zIntegration.deser.parameterSize
 
 import io.github.projectmapk.jackson.module.kogera.assertReflectEquals
-import io.github.projectmapk.jackson.module.kogera.callPrimaryConstructorByParamName
+import io.github.projectmapk.jackson.module.kogera.callPrimaryConstructor
 import io.github.projectmapk.jackson.module.kogera.defaultMapper
 import io.github.projectmapk.jackson.module.kogera.readValue
-import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 
 /**
@@ -50,9 +50,9 @@ class DeserializeByConstructorWithoutDefaultArgumentsTest {
 
     @Test
     fun test32() {
-        val expected = callPrimaryConstructorByParamName<Dst32>()
+        val expected = callPrimaryConstructor<Dst32>()
         val src = defaultMapper.writeValueAsString(expected)
-        assertEquals(expected, defaultMapper.readValue<Dst32>(src))
+        Assertions.assertEquals(expected, defaultMapper.readValue<Dst32>(src))
     }
 
     data class Dst33(
@@ -93,9 +93,9 @@ class DeserializeByConstructorWithoutDefaultArgumentsTest {
 
     @Test
     fun test33() {
-        val expected = callPrimaryConstructorByParamName<Dst33>()
+        val expected = callPrimaryConstructor<Dst33>()
         val src = defaultMapper.writeValueAsString(expected)
-        assertEquals(expected, defaultMapper.readValue<Dst33>(src))
+        Assertions.assertEquals(expected, defaultMapper.readValue<Dst33>(src))
     }
 
     data class Dst64(
@@ -167,9 +167,9 @@ class DeserializeByConstructorWithoutDefaultArgumentsTest {
 
     @Test
     fun test64() {
-        val expected = callPrimaryConstructorByParamName<Dst64>()
+        val expected = callPrimaryConstructor<Dst64>()
         val src = defaultMapper.writeValueAsString(expected)
-        assertEquals(expected, defaultMapper.readValue<Dst64>(src))
+        Assertions.assertEquals(expected, defaultMapper.readValue<Dst64>(src))
     }
 
     data class Dst65(
@@ -242,9 +242,9 @@ class DeserializeByConstructorWithoutDefaultArgumentsTest {
 
     @Test
     fun test65() {
-        val expected = callPrimaryConstructorByParamName<Dst65>()
+        val expected = callPrimaryConstructor<Dst65>()
         val src = defaultMapper.writeValueAsString(expected)
-        assertEquals(expected, defaultMapper.readValue<Dst65>(src))
+        Assertions.assertEquals(expected, defaultMapper.readValue<Dst65>(src))
     }
 
     // It cannot be a data class because the generated method would exceed the argument size limit.
@@ -507,7 +507,7 @@ class DeserializeByConstructorWithoutDefaultArgumentsTest {
 
     @Test
     fun testMax() {
-        val expected = callPrimaryConstructorByParamName<DstMax>()
+        val expected = callPrimaryConstructor<DstMax>()
         val src = defaultMapper.writeValueAsString(expected)
         assertReflectEquals(expected, defaultMapper.readValue<DstMax>(src))
     }

src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/DeserializeByFactoryWithDefaultArgumentsTest.kt renamed to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/parameterSize/DeserializeByFactoryWithDefaultArgumentsTest.kt

@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera.zIntegration.deser
+package io.github.projectmapk.jackson.module.kogera.zIntegration.deser.parameterSize
 
 import com.fasterxml.jackson.annotation.JsonCreator
 import io.github.projectmapk.jackson.module.kogera.assertReflectEquals
@@ -7,13 +7,10 @@ import io.github.projectmapk.jackson.module.kogera.readValue
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 
-// Convert the property p to q (but not the value) to make it an input to the factory function.
-private fun replacePQ(src: String) = src.replace(Regex("""p\d+":""")) { "q" + it.value.substring(1) }
-
 /**
  * Up to argument size 32 there is one mask argument for the default argument,
  * 33 ~ 64 there are two, and 65 there are three, so each boundary value is tested.
- * Also, the maximum argument size that can be set in the constructor is 254, so that case is tested as well.
+ * Also, the maximum argument size that can be set in the constructor is 244, so that case is tested as well.
  */
 class DeserializeByFactoryWithDefaultArgumentsTest {
     data class Dst32(

src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/DeserializeByFactoryWithoutDefaultArgumentsTest.kt renamed to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/parameterSize/DeserializeByFactoryWithoutDefaultArgumentsTest.kt

@@ -1,11 +1,11 @@
-package io.github.projectmapk.jackson.module.kogera.zIntegration.deser
+package io.github.projectmapk.jackson.module.kogera.zIntegration.deser.parameterSize
 
 import com.fasterxml.jackson.annotation.JsonCreator
 import io.github.projectmapk.jackson.module.kogera.assertReflectEquals
-import io.github.projectmapk.jackson.module.kogera.callPrimaryConstructorByParamName
+import io.github.projectmapk.jackson.module.kogera.callPrimaryConstructor
 import io.github.projectmapk.jackson.module.kogera.defaultMapper
 import io.github.projectmapk.jackson.module.kogera.readValue
-import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 
 // Convert the property p to q (but not the value) to make it an input to the factory function.
@@ -126,9 +126,9 @@ class DeserializeByFactoryWithoutDefaultArgumentsTest {
 
     @Test
     fun test32() {
-        val expected = callPrimaryConstructorByParamName<Dst32>()
+        val expected = callPrimaryConstructor<Dst32>()
         val src = replacePQ(defaultMapper.writeValueAsString(expected))
-        assertEquals(expected, defaultMapper.readValue<Dst32>(src))
+        Assertions.assertEquals(expected, defaultMapper.readValue<Dst32>(src))
     }
 
     data class Dst33(
@@ -243,9 +243,9 @@ class DeserializeByFactoryWithoutDefaultArgumentsTest {
 
     @Test
     fun test33() {
-        val expected = callPrimaryConstructorByParamName<Dst33>()
+        val expected = callPrimaryConstructor<Dst33>()
         val src = replacePQ(defaultMapper.writeValueAsString(expected))
-        assertEquals(expected, defaultMapper.readValue<Dst33>(src))
+        Assertions.assertEquals(expected, defaultMapper.readValue<Dst33>(src))
     }
 
     data class Dst64(
@@ -453,9 +453,9 @@ class DeserializeByFactoryWithoutDefaultArgumentsTest {
 
     @Test
     fun test64() {
-        val expected = callPrimaryConstructorByParamName<Dst64>()
+        val expected = callPrimaryConstructor<Dst64>()
         val src = replacePQ(defaultMapper.writeValueAsString(expected))
-        assertEquals(expected, defaultMapper.readValue<Dst64>(src))
+        Assertions.assertEquals(expected, defaultMapper.readValue<Dst64>(src))
     }
 
     data class Dst65(
@@ -666,9 +666,9 @@ class DeserializeByFactoryWithoutDefaultArgumentsTest {
 
     @Test
     fun test65() {
-        val expected = callPrimaryConstructorByParamName<Dst65>()
+        val expected = callPrimaryConstructor<Dst65>()
         val src = replacePQ(defaultMapper.writeValueAsString(expected))
-        assertEquals(expected, defaultMapper.readValue<Dst65>(src))
+        Assertions.assertEquals(expected, defaultMapper.readValue<Dst65>(src))
     }
 
     // It cannot be a data class because the generated method would exceed the argument size limit.
@@ -1447,7 +1447,7 @@ class DeserializeByFactoryWithoutDefaultArgumentsTest {
 
     @Test
     fun testMax() {
-        val expected = callPrimaryConstructorByParamName<DstMax>()
+        val expected = callPrimaryConstructor<DstMax>()
         val src = replacePQ(defaultMapper.writeValueAsString(expected))
         assertReflectEquals(expected, defaultMapper.readValue<DstMax>(src))
     }