Merge branch 'master' into ssrf-test-assertions

Author: seran

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")
+    }
+
 }

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()
+
+}

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
+
+}

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

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

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","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/security/ssrf/base/SSRFBaseEMTest.kt

@@ -37,9 +37,6 @@ class SSRFBaseEMTest : SpringTestBase() {
             setOption(args, "languageModelConnector", "false")
             setOption(args, "schemaOracles", "false")
 
-            // TODO: Remove once EnumGene is supported for DTOs
-            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","false")
-
             val solution = initAndRun(args)
 
             Assertions.assertTrue(solution.individuals.isNotEmpty())

core/src/main/kotlin/org/evomaster/core/EMConfig.kt

@@ -1162,7 +1162,7 @@ class EMConfig {
 
     enum class Algorithm {
         DEFAULT, SMARTS, MIO, RANDOM, WTS, MOSA, RW,
-        StandardGA, MonotonicGA, SteadyStateGA, BreederGA, CellularGA, OnePlusLambdaLambdaGA, MuLambdaEA, MuPlusLambdaEA, LIPS // GA variants still work-in-progress.
+        StandardGA, MonotonicGA, SteadyStateGA, BreederGA, CellularGA, OnePlusLambdaLambdaGA, MuLambdaEA, MuPlusLambdaEA, LIPS, CRO // GA variants still work-in-progress.
     }
 
     @Cfg("The algorithm used to generate test cases. The default depends on whether black-box or white-box testing is done.")
@@ -1575,6 +1575,27 @@ class EMConfig {
     @Min(1.0)
     var tournamentSize = 10
 
+    // --- Chemical Reaction Optimization (CRO) parameters ---
+    @Cfg("CRO: Molecular collision rate c_r (probability of binary reactions)")
+    @Probability
+    var croMolecularCollisionRate: Double = 0.2
+
+    @Cfg("CRO: Kinetic energy loss rate k_r (lower bound of retained fraction after on-wall)")
+    @Probability
+    var croKineticEnergyLossRate: Double = 0.2
+
+    @Cfg("CRO: Initial kinetic energy assigned to each molecule")
+    @Min(0.0)
+    var croInitialKineticEnergy: Double = 1000.0
+
+    @Cfg("CRO: Decomposition threshold d_t (min number of collisions before decomposition)")
+    @Min(0.0)
+    var croDecompositionThreshold: Int = 500
+
+    @Cfg("CRO: Synthesis KE threshold s_t (molecule can synthesize if KE ≤ s_t)")
+    @Min(0.0)
+    var croSynthesisThreshold: Double = 10.0
+
     @Cfg("When sampling new test cases to evaluate, probability of using some smart strategy instead of plain random")
     @Probability
     var probOfSmartSampling = 0.95

core/src/main/kotlin/org/evomaster/core/Main.kt

@@ -791,6 +791,9 @@ class Main {
                 EMConfig.Algorithm.OnePlusLambdaLambdaGA ->
                     Key.get(object : TypeLiteral<OnePlusLambdaLambdaGeneticAlgorithm<RestIndividual>>() {})
 
+                EMConfig.Algorithm.CRO ->
+                    Key.get(object : TypeLiteral<CroAlgorithm<RestIndividual>>() {})
+
                 else -> throw IllegalStateException("Unrecognized algorithm ${config.algorithm}")
             }
         }