WIP for EnumGene in dto

Author: Pgarrett

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

@@ -40,7 +40,7 @@ class SSRFBaseDisableEMTest : SpringTestBase() {
             setOption(args, "disabledOracleCodes", DefinedFaultCategory.SSRF.code.toString())
 
             // TODO: Remove once EnumGene is supported for DTOs
-            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/security/ssrf/base/SSRFBaseEMTest.kt

@@ -38,7 +38,8 @@ class SSRFBaseEMTest : SpringTestBase() {
             setOption(args, "schemaOracles", "false")
 
             // TODO: Remove once EnumGene is supported for DTOs
-            setOption(args, "dtoForRequestPayload","false")
+            setOption(args, "dtoForRequestPayload","true")
+//            setOption(args, "dtoForRequestPayload","false")
 
             val solution = initAndRun(args)
 

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

@@ -27,7 +27,7 @@ class SwaggerDescriptionEMTest : SpringTestBase() {
         ) { args: MutableList<String> ->
 
             // TODO: Remove once EnumGene is supported for DTOs
-            setOption(args, "dtoForRequestPayload","false")
+            setOption(args, "dtoForRequestPayload","true")
 
             val solution = initAndRun(args)
 

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

@@ -96,21 +96,23 @@ class DtoWriter(
         // TODO: should we handle EnumGene?
         if (hasObjectOrArrayGene(gene)) {
             val dtoName = TestWriterUtils.safeVariableName(actionName)
-            val dtoClass = DtoClass(dtoName)
-            val children = gene.getViewOfChildren()
-            // merge options into a single DTO
-            children.forEach { childGene ->
-                when (childGene) {
-                    is ObjectGene -> populateDtoClass(dtoClass, childGene)
-                    is ArrayGene<*> -> {
-                        val template = childGene.template
-                        if (template is ObjectGene) {
-                            populateDtoClass(dtoClass, template)
+            if (!dtoCollector.contains(dtoName)) {
+                val dtoClass = DtoClass(dtoName)
+                val children = gene.getViewOfChildren()
+                // merge options into a single DTO
+                children.forEach { childGene ->
+                    when (childGene) {
+                        is ObjectGene -> populateDtoClass(dtoClass, childGene)
+                        is ArrayGene<*> -> {
+                            val template = childGene.template
+                            if (template is ObjectGene) {
+                                populateDtoClass(dtoClass, template)
+                            }
                         }
                     }
                 }
+                dtoCollector.put(dtoName, dtoClass)
             }
-            dtoCollector.put(dtoName, dtoClass)
         }
     }
 
@@ -139,10 +141,12 @@ class DtoWriter(
     private fun calculateDtoFromObject(gene: ObjectGene, actionName: String) {
         // TODO: Determine strategy for objects that are not defined as a component and do not have a name
         val dtoName = TestWriterUtils.safeVariableName(gene.refType?:actionName)
-        val dtoClass = DtoClass(dtoName)
-        // TODO: add support for additionalFields
-        populateDtoClass(dtoClass, gene)
-        dtoCollector.put(dtoName, dtoClass)
+        if (!dtoCollector.contains(dtoName)) {
+            val dtoClass = DtoClass(dtoName)
+            // TODO: add support for additionalFields
+            populateDtoClass(dtoClass, gene)
+            dtoCollector.put(dtoName, dtoClass)
+        }
     }
 
     private fun calculateDtoFromArray(gene: ArrayGene<*>, actionName: String) {