Remove setOption for DTO tests, set targetFormat when writing values in DTO output

Author: Pgarrett

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

@@ -39,9 +39,6 @@ class SSRFBaseDisableEMTest : SpringTestBase() {
             setOption(args, "schemaOracles", "false")
             setOption(args, "disabledOracleCodes", DefinedFaultCategory.SSRF.code.toString())
 
-            // TODO: Remove once EnumGene is supported for DTOs
-            setOption(args, "dtoForRequestPayload","true")
-
             val solution = initAndRun(args)
 
             assertTrue(solution.individuals.isNotEmpty())

core-tests/e2e-tests/spring/spring-rest-openapi-v3/src/test/kotlin/org/evomaster/e2etests/spring/openapi/v3/security/ssrf/base/SSRFBaseEMTest.kt

@@ -37,10 +37,6 @@ class SSRFBaseEMTest : SpringTestBase() {
             setOption(args, "languageModelConnector", "false")
             setOption(args, "schemaOracles", "false")
 
-            // TODO: Remove once EnumGene is supported for DTOs
-            setOption(args, "dtoForRequestPayload","true")
-//            setOption(args, "dtoForRequestPayload","false")
-
             val solution = initAndRun(args)
 
             assertTrue(solution.individuals.isNotEmpty())

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

@@ -26,9 +26,6 @@ class SwaggerDescriptionEMTest : SpringTestBase() {
             500
         ) { args: MutableList<String> ->
 
-            // TODO: Remove once EnumGene is supported for DTOs
-            setOption(args, "dtoForRequestPayload","true")
-
             val solution = initAndRun(args)
 
             Assertions.assertTrue(solution.individuals.isNotEmpty())

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

@@ -109,9 +109,9 @@ class GeneToDto(
                     if (leafGene is EnumGene<*> && it is ChoiceGene<*>) {
                         val children = it.getViewOfChildren()
                         val otherChoice = children.find { child -> child != leafGene }
-                        result.add(dtoOutput.getSetterStatement(dtoVarName, attributeName, "${leafGene.getValueAsPrintableString(targetFormat = null)}${getValueSuffix(otherChoice)}"))
+                        result.add(dtoOutput.getSetterStatement(dtoVarName, attributeName, "${leafGene.getValueAsPrintableString(targetFormat = outputFormat)}${getValueSuffix(otherChoice)}"))
                     } else {
-                        result.add(dtoOutput.getSetterStatement(dtoVarName, attributeName, "${leafGene.getValueAsPrintableString(targetFormat = null)}${getValueSuffix(leafGene)}"))
+                        result.add(dtoOutput.getSetterStatement(dtoVarName, attributeName, "${leafGene.getValueAsPrintableString(targetFormat = outputFormat)}${getValueSuffix(leafGene)}"))
                     }
                 }
             }
@@ -142,7 +142,7 @@ class GeneToDto(
         } else {
             gene.getViewOfElements().forEach {
                 val leafGene = it.getLeafGene()
-                result.add(dtoOutput.getAddElementToListStatement(listVarName, "${leafGene.getValueAsPrintableString(targetFormat = null)}${getValueSuffix(leafGene)}"))
+                result.add(dtoOutput.getAddElementToListStatement(listVarName, "${leafGene.getValueAsPrintableString(targetFormat = outputFormat)}${getValueSuffix(leafGene)}"))
             }
         }