Merge pull request #1473 from WebFuzzing/phg/dto-handle-null

Handle null in DTO

Author: arcuri82

core-tests/e2e-tests/spring/spring-rest-bb/src/test/kotlin/org/evomaster/e2etests/spring/rest/bb/dtonull/BBDtoNullEMTest.kt

@@ -41,9 +41,7 @@ class BBDtoNullEMTest : SpringTestBase() {
 
             setOption(args, "bbSwaggerUrl", "$baseUrlOfSut/openapi-dtonull.json")
 
-            //TODO need to fix/extend DTO handling before activating it here
-//            setOption(args, "dtoForRequestPayload", "true")
-            setOption(args, "dtoForRequestPayload", "false")
+            setOption(args, "dtoForRequestPayload", "true")
 
             val solution = initAndRun(args)
 

core-tests/e2e-tests/spring/spring-rest-openapi-v3/src/test/kotlin/org/evomaster/e2etests/spring/openapi/v3/dtoreflectiveassert/DtoReflectiveAssertEMTest.kt

@@ -7,6 +7,7 @@ import org.evomaster.e2etests.spring.openapi.v3.SpringTestBase
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.Test
+import java.util.Optional.ofNullable
 import kotlin.reflect.KClass
 import kotlin.reflect.KMutableProperty1
 import kotlin.reflect.full.createInstance
@@ -174,9 +175,9 @@ class DtoReflectiveAssertEMTest: SpringTestBase() {
 
         property?.let {
             it.isAccessible = true
-            it.set(instance, propertyValue) // Set the value
+            it.set(instance, ofNullable(propertyValue)) // Set the value
         }
-        Assertions.assertEquals(propertyValue, property?.get(instance))
+        Assertions.assertEquals(ofNullable(propertyValue), property?.get(instance))
     }
 
     private fun assertAdditionalPropertiesFunction(klass: KClass<out Any>, instance: Any, propertyName: String, propertyValue: Any?) {

core/src/main/kotlin/org/evomaster/core/output/dto/GeneToDto.kt

@@ -22,6 +22,7 @@ import org.evomaster.core.search.gene.string.Base64StringGene
 import org.evomaster.core.search.gene.string.StringGene
 import org.evomaster.core.search.gene.utils.GeneUtils.isInactiveOptionalGene
 import org.evomaster.core.search.gene.wrapper.ChoiceGene
+import org.evomaster.core.search.gene.wrapper.NullableGene
 import org.evomaster.core.search.gene.wrapper.OptionalGene
 import org.evomaster.core.utils.StringUtils
 import org.slf4j.Logger
@@ -120,6 +121,8 @@ class GeneToDto(
                         val children = parent.getViewOfChildren()
                         val otherChoice = children.find { child -> child != leafGene }
                         result.add(dtoOutput.getSetterStatement(dtoVarName, attributeName, "${leafGene.getValueAsPrintableString(targetFormat = outputFormat)}${getValueSuffix(otherChoice)}"))
+                    } else if (parent is NullableGene) {
+                        result.add(dtoOutput.getSetterStatement(dtoVarName, attributeName, "${parent.getValueAsPrintableString(targetFormat = outputFormat)}${getValueSuffix(leafGene)}"))
                     } else {
                         result.add(dtoOutput.getSetterStatement(dtoVarName, attributeName, "${leafGene.getValueAsPrintableString(targetFormat = outputFormat)}${getValueSuffix(leafGene)}"))
                     }

core/src/main/kotlin/org/evomaster/core/output/dto/KotlinDtoOutput.kt

@@ -3,6 +3,7 @@ package org.evomaster.core.output.dto
 import org.evomaster.core.output.Lines
 import org.evomaster.core.output.OutputFormat
 import org.evomaster.core.output.TestSuiteFileName
+import org.evomaster.core.utils.StringUtils.capitalizeFirstChar
 import java.nio.file.Path
 
 class KotlinDtoOutput: JvmDtoOutput() {
@@ -21,7 +22,7 @@ class KotlinDtoOutput: JvmDtoOutput() {
     }
 
     override fun getSetterStatement(dtoVarName: String, attributeName: String, value: String): String {
-        return "$dtoVarName.${attributeName} = $value"
+        return "$dtoVarName.set${capitalizeFirstChar(attributeName)}($value)"
     }
 
     override fun getNewListStatement(listType: String, listVarName: String): String {
@@ -40,14 +41,15 @@ class KotlinDtoOutput: JvmDtoOutput() {
         lines.add("@JsonInclude(JsonInclude.Include.NON_NULL)")
         lines.add("class $dtoFilename {")
         addVariables(lines, dtoClass)
+        addGettersAndSetters(lines, dtoClass)
         lines.add("}")
     }
 
     private fun addVariables(lines: Lines, dtoClass: DtoClass) {
         dtoClass.fieldsMap.forEach {
             lines.indented {
                 lines.add("@JsonProperty(\"${it.key}\")")
-                lines.add("var ${it.key}: ${it.value.type}? = null")
+                lines.add("private var ${it.key}: Optional<${it.value.type}>? = null")
             }
             lines.addEmpty()
         }
@@ -83,4 +85,22 @@ class KotlinDtoOutput: JvmDtoOutput() {
         }
     }
 
+    private fun addGettersAndSetters(lines: Lines, dtoClass: DtoClass) {
+        dtoClass.fieldsMap.forEach {
+            val varName = it.key
+            val varType = it.value.type
+            val capitalizedVarName = capitalizeFirstChar(varName)
+            lines.indented {
+                lines.add("fun get${capitalizedVarName}(): Optional<${varType}>? = $varName")
+                lines.addEmpty()
+                lines.add("fun set${capitalizedVarName}(${varName}: ${varType}?) {")
+                lines.indented {
+                    lines.add("this.${varName} = Optional.ofNullable(${varName})")
+                }
+                lines.add("}")
+            }
+            lines.addEmpty()
+        }
+    }
+
 }