EnumGene supported for DTO usage

Pgarrett · Pgarrett · commit ea8a580a7cae · 2025-11-21T17:40:07.000-03:00
diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v3/src/main/kotlin/com/foo/rest/examples/spring/openapi/v3/dtoreflectiveassert/DtoReflectiveAssertRest.kt b/core-tests/e2e-tests/spring/spring-rest-openapi-v3/src/main/kotlin/com/foo/rest/examples/spring/openapi/v3/dtoreflectiveassert/DtoReflectiveAssertRest.kt
@@ -44,4 +44,14 @@ class DtoReflectiveAssertRest {
         return ResponseEntity.ok("OK")
     }
 
+    @PostMapping(path = ["/enum-examples"], consumes = [MediaType.APPLICATION_JSON_VALUE])
+    open fun enumExamples(@RequestBody body: EnumExamplesDto) : ResponseEntity<String>{
+        return ResponseEntity.ok("OK")
+    }
+
+    @PostMapping(path = ["/enum-type"], consumes = [MediaType.APPLICATION_JSON_VALUE])
+    open fun enumType(@RequestBody body: EnumTypeDto) : ResponseEntity<String>{
+        return ResponseEntity.ok("OK")
+    }
+
 }
diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v3/src/main/kotlin/com/foo/rest/examples/spring/openapi/v3/dtoreflectiveassert/EnumExamplesDto.kt b/core-tests/e2e-tests/spring/spring-rest-openapi-v3/src/main/kotlin/com/foo/rest/examples/spring/openapi/v3/dtoreflectiveassert/EnumExamplesDto.kt
@@ -0,0 +1,11 @@
+package com.foo.rest.examples.spring.openapi.v3.dtoreflectiveassert
+
+class EnumExamplesDto {
+
+    var textValue: String = ""
+    var flagValue: Boolean = false
+    var countValue: Int = -1
+    var scoreValue: Float = -3.14f
+    var listValue: List<String> = emptyList()
+
+}
diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v3/src/main/kotlin/com/foo/rest/examples/spring/openapi/v3/dtoreflectiveassert/EnumTypeDto.kt b/core-tests/e2e-tests/spring/spring-rest-openapi-v3/src/main/kotlin/com/foo/rest/examples/spring/openapi/v3/dtoreflectiveassert/EnumTypeDto.kt
@@ -0,0 +1,9 @@
+package com.foo.rest.examples.spring.openapi.v3.dtoreflectiveassert
+
+class EnumTypeDto {
+
+    var name: String = ""
+    var status: String = ""
+    var intStatus: Int = -10
+
+}
diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v3/src/main/resources/static/openapi-dto-reflective-assert.yaml b/core-tests/e2e-tests/spring/spring-rest-openapi-v3/src/main/resources/static/openapi-dto-reflective-assert.yaml
@@ -166,6 +166,30 @@ paths:
       responses:
         '200':
           description: OK
+  /enum-type:
+    post:
+      summary: Create an item using enums
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/EnumType'
+      responses:
+        '200':
+          description: OK
+  /enum-examples:
+    post:
+      summary: Submit an object using examples
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/EnumExample'
+      responses:
+        '200':
+          description: OK
 
 components:
   schemas:
@@ -211,3 +235,47 @@ components:
       required:
         - name
         - age
+
+    EnumType:
+      type: object
+      properties:
+        name:
+          type: string
+        status:
+          type: string
+          enum: [ active, inactive, archived ]
+        intStatus:
+          type: integer
+          enum: [ -1, 0, 1 ]
+      required:
+        - name
+        - status
+        - intStatus
+
+    EnumExample:
+      type: object
+      properties:
+        textValue:
+          type: string
+          example: "hello world"
+        flagValue:
+          type: boolean
+          example: true
+        countValue:
+          type: integer
+          example: 33
+        scoreValue:
+          type: number
+          format: float
+          example: 3.14
+        listValue:
+          type: array
+          items:
+            type: string
+          example: [ "s1", "s2", "s3" ]
+      required:
+        - textValue
+        - flagValue
+        - countValue
+        - scoreValue
+        - listValue
diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v3/src/test/kotlin/org/evomaster/e2etests/spring/openapi/v3/dtoreflectiveassert/DtoReflectiveAssertEMTest.kt b/core-tests/e2e-tests/spring/spring-rest-openapi-v3/src/test/kotlin/org/evomaster/e2etests/spring/openapi/v3/dtoreflectiveassert/DtoReflectiveAssertEMTest.kt
@@ -43,6 +43,8 @@ class DtoReflectiveAssertEMTest: SpringTestBase() {
             assertHasAtLeastOne(solution, HttpVerb.POST, 200, "/parent", "OK")
             assertHasAtLeastOne(solution, HttpVerb.POST, 200, "/items-inline", "OK")
             assertHasAtLeastOne(solution, HttpVerb.POST, 200, "/items-components", "OK")
+            assertHasAtLeastOne(solution, HttpVerb.POST, 200, "/enum-type", "OK")
+            assertHasAtLeastOne(solution, HttpVerb.POST, 200, "/enum-examples", "OK")
         }
 
         assertPrimitiveTypeDtoCreated()
@@ -51,6 +53,8 @@ class DtoReflectiveAssertEMTest: SpringTestBase() {
         assertItemsInlineDtoCreated()
         assertAnyOfDtoCreated()
         assertOneOfDtoCreated()
+        assertEnumTypeDtoCreated()
+        assertEnumExampleDtoCreated()
     }
 
     private fun assertPrimitiveTypeDtoCreated() {
@@ -107,6 +111,22 @@ class DtoReflectiveAssertEMTest: SpringTestBase() {
         assertProperty(klass, instance, "mouse", "Jerry")
     }
 
+    private fun assertEnumTypeDtoCreated() {
+        val (klass, instance) = initDtoClass("EnumType")
+        assertProperty(klass, instance, "name", "EvoMaster")
+        assertProperty(klass, instance, "status", "active")
+        assertProperty(klass, instance, "intStatus", 1)
+    }
+
+    private fun assertEnumExampleDtoCreated() {
+        val (klass, instance) = initDtoClass("EnumExample")
+        assertProperty(klass, instance, "textValue", "A text value")
+        assertProperty(klass, instance, "flagValue", true)
+        assertProperty(klass, instance, "countValue", 33)
+        assertProperty(klass, instance, "scoreValue", 3.14f)
+        assertProperty(klass, instance, "listValue", mutableListOf("s1", "s2", "s3"))
+    }
+
     private fun initDtoClass(name: String): Pair<KClass<out Any>, Any> {
         val className = ClassName("org.foo.dto.$name")
         val klass = loadClass(className).kotlin
diff --git a/core/src/main/kotlin/org/evomaster/core/output/dto/DtoWriter.kt b/core/src/main/kotlin/org/evomaster/core/output/dto/DtoWriter.kt
@@ -11,6 +11,7 @@ import org.evomaster.core.search.gene.BooleanGene
 import org.evomaster.core.search.gene.Gene
 import org.evomaster.core.search.gene.ObjectGene
 import org.evomaster.core.search.gene.collection.ArrayGene
+import org.evomaster.core.search.gene.collection.EnumGene
 import org.evomaster.core.search.gene.datetime.DateGene
 import org.evomaster.core.search.gene.datetime.DateTimeGene
 import org.evomaster.core.search.gene.datetime.TimeGene
@@ -93,7 +94,6 @@ class DtoWriter(
 
 
     private fun calculateDtoFromChoice(gene: ChoiceGene<*>, actionName: String) {
-        // TODO: should we handle EnumGene?
         if (hasObjectOrArrayGene(gene)) {
             val dtoName = TestWriterUtils.safeVariableName(actionName)
             if (!dtoCollector.contains(dtoName)) {
@@ -143,16 +143,15 @@ class DtoWriter(
         val dtoName = TestWriterUtils.safeVariableName(gene.refType?:actionName)
         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) {
         val template = gene.template
-        // TODO consider ChoiceGene. Primitive types won't be considered, an array of strings should not be wrapped
-        //  into a DTO but just use List<String> for setting the payload.
+        // Primitive types won't be considered, an array of strings should not be wrapped
+        // into a DTO but just use List<String> for setting the payload.
         if (template is ObjectGene) {
             calculateDtoFromObject(template, actionName)
         } else {
@@ -188,7 +187,6 @@ class DtoWriter(
 
     private fun getDtoType(fieldName: String, field: Gene?): String {
         return when (field) {
-            // TODO: handle nested arrays, objects and extend type system for dto fields
             is StringGene -> "String"
             is IntegerGene -> if (outputFormat.isJava()) "Integer" else "Int"
             is LongGene -> "Long"
@@ -203,6 +201,7 @@ class DtoWriter(
             is BooleanGene -> "Boolean"
             is ObjectGene -> field.refType?:StringUtils.capitalization(fieldName)
             is ArrayGene<*> -> if (outputFormat.isJava()) "List<${getDtoType(field.name, field.template)}>" else "MutableList<${getDtoType(field.name, field.template)}>"
+            is EnumGene<*> -> field.getValueType(outputFormat.isKotlin())
             else -> throw Exception("Not supported gene at the moment: ${field?.javaClass?.simpleName} for field $fieldName")
         }
     }
diff --git a/core/src/main/kotlin/org/evomaster/core/output/dto/GeneToDto.kt b/core/src/main/kotlin/org/evomaster/core/output/dto/GeneToDto.kt
@@ -6,6 +6,7 @@ import org.evomaster.core.search.gene.BooleanGene
 import org.evomaster.core.search.gene.Gene
 import org.evomaster.core.search.gene.ObjectGene
 import org.evomaster.core.search.gene.collection.ArrayGene
+import org.evomaster.core.search.gene.collection.EnumGene
 import org.evomaster.core.search.gene.datetime.DateGene
 import org.evomaster.core.search.gene.datetime.DateTimeGene
 import org.evomaster.core.search.gene.datetime.TimeGene
@@ -105,7 +106,13 @@ class GeneToDto(
                     result.add(dtoOutput.getSetterStatement(dtoVarName, attributeName, childDtoCall.varName))
                 }
                 else -> {
-                    result.add(dtoOutput.getSetterStatement(dtoVarName, attributeName, "${leafGene.getValueAsPrintableString(targetFormat = null)}${getValueSuffix(leafGene)}"))
+                    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)}"))
+                    } else {
+                        result.add(dtoOutput.getSetterStatement(dtoVarName, attributeName, "${leafGene.getValueAsPrintableString(targetFormat = null)}${getValueSuffix(leafGene)}"))
+                    }
                 }
             }
         }
@@ -164,7 +171,7 @@ class GeneToDto(
 
     // According to documentation, a trailing constant is only needed for Long, Hexadecimal and Float
     // https://kotlinlang.org/docs/numbers.html#literal-constants-for-numbers
-    private fun getValueSuffix(gene: Gene): String {
+    private fun getValueSuffix(gene: Gene?): String {
         return when (gene) {
             is LongGene -> "L"
             is FloatGene -> "f"
diff --git a/core/src/main/kotlin/org/evomaster/core/search/gene/collection/EnumGene.kt b/core/src/main/kotlin/org/evomaster/core/search/gene/collection/EnumGene.kt
@@ -1,11 +1,17 @@
 package org.evomaster.core.search.gene.collection
 
 import org.evomaster.core.output.OutputFormat
+import org.evomaster.core.search.gene.BooleanGene
 import org.evomaster.core.search.gene.Gene
 import org.evomaster.core.search.gene.interfaces.NamedExamplesGene
+import org.evomaster.core.search.gene.numeric.DoubleGene
+import org.evomaster.core.search.gene.numeric.FloatGene
+import org.evomaster.core.search.gene.numeric.IntegerGene
+import org.evomaster.core.search.gene.numeric.LongGene
 import org.evomaster.core.search.gene.string.StringGene
 import org.evomaster.core.search.gene.root.SimpleGene
 import org.evomaster.core.search.gene.utils.GeneUtils
+import org.evomaster.core.search.gene.wrapper.ChoiceGene
 import org.evomaster.core.search.impact.impactinfocollection.value.collection.EnumGeneImpact
 import org.evomaster.core.search.service.AdaptiveParameterControl
 import org.evomaster.core.search.service.Randomness
@@ -197,6 +203,29 @@ class EnumGene<T : Comparable<T>>(
         return valueNames?.get(index)
     }
 
+    fun getValueType(isKotlinOutput: Boolean): String {
+        return when {
+            values.isEmpty() -> "String"
+            parent is ChoiceGene<*> -> getTypeForExampleEnum(isKotlinOutput)
+            values.first() is Int && isKotlinOutput -> "Int"
+            else -> values.first().javaClass.simpleName
+        }
+    }
+
+    // In this case whe need to check the other leaf in the ChoiceGene to extract the example type
+    private fun getTypeForExampleEnum(isKotlinOutput: Boolean): String {
+        val children = (parent as ChoiceGene<*>).getViewOfChildren()
+        val otherChoice = children.find { it != this }
+        return when (otherChoice) {
+            is IntegerGene -> if (isKotlinOutput) "Int" else "Integer"
+            is LongGene -> "Long"
+            is DoubleGene -> "Double"
+            is FloatGene -> "Float"
+            is BooleanGene -> "Boolean"
+            else -> "String"
+        }
+    }
+
     override fun copyValueFrom(other: Gene): Boolean {
         if (other !is EnumGene<*>) {
             throw IllegalArgumentException("Invalid gene type ${other.javaClass}")
@@ -243,4 +272,4 @@ class EnumGene<T : Comparable<T>>(
         index = target
         return true
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -44,4 +44,14 @@ class DtoReflectiveAssertRest {`
`44`	`44`	`return ResponseEntity.ok("OK")`
`45`	`45`	`}`
`46`	`46`
	`47`	`+ @PostMapping(path = ["/enum-examples"], consumes = [MediaType.APPLICATION_JSON_VALUE])`
	`48`	`+ open fun enumExamples(@RequestBody body: EnumExamplesDto) : ResponseEntity<String>{`
	`49`	`+ return ResponseEntity.ok("OK")`
	`50`	`+ }`
	`51`	`+`
	`52`	`+ @PostMapping(path = ["/enum-type"], consumes = [MediaType.APPLICATION_JSON_VALUE])`
	`53`	`+ open fun enumType(@RequestBody body: EnumTypeDto) : ResponseEntity<String>{`
	`54`	`+ return ResponseEntity.ok("OK")`
	`55`	`+ }`
	`56`	`+`
`47`	`57`	`}`