fixed handling of cleanup actions in merge

Author: arcuri82

core-tests/integration-tests/core-it/src/test/kotlin/org/evomaster/core/problem/rest/IntegrationTestRestBase.kt

@@ -49,19 +49,21 @@ abstract class IntegrationTestRestBase : RestTestBase() {
         injector = init(args)
     }
 
-    fun getPirToRest() = injector.getInstance(PirToRest::class.java)
+    fun getPirToRest() = injector.getInstance(PirToRest::class.java)!!
 
     fun getArchive() = injector.getInstance(Archive::class.java) as Archive<RestIndividual>
 
     fun getSecurityRest() = injector.getInstance(RestSecurityBuilder::class.java) as RestSecurityBuilder
 
-    fun getEMConfig() = injector.getInstance(EMConfig::class.java)
+    fun getEMConfig() = injector.getInstance(EMConfig::class.java)!!
 
-    fun getBuilder() = injector.getInstance(RestIndividualBuilder::class.java)
+    fun getBuilder() = injector.getInstance(RestIndividualBuilder::class.java)!!
 
-    fun getSecurityOracle() = injector.getInstance(RestSecurityOracle::class.java)
+    fun getSecurityOracle() = injector.getInstance(RestSecurityOracle::class.java)!!
 
-    fun getExecutionPhaseController() = injector.getInstance(ExecutionPhaseController::class.java)
+    fun getExecutionPhaseController() = injector.getInstance(ExecutionPhaseController::class.java)!!
+
+    fun getFitnessFunction() = injector.getInstance(AbstractRestFitness::class.java)!!
 
     /**
      * Create and evaluate an individual
@@ -79,10 +81,10 @@ abstract class IntegrationTestRestBase : RestTestBase() {
          */
         val ind = sampler.createIndividual(sampleT, actions.toMutableList())
 
-        val ff = injector.getInstance(AbstractRestFitness::class.java)
+        val ff = getFitnessFunction()
         val ei = ff.calculateCoverage(ind)!!
 
         return ei
     }
 
-}
+}

core-tests/integration-tests/core-it/src/test/kotlin/org/evomaster/core/problem/rest/cleanupuuid/CleanUpUUIDTest.kt

@@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import org.evomaster.core.problem.enterprise.SampleType
 import org.evomaster.core.problem.rest.IntegrationTestRestBase
 import org.evomaster.core.problem.rest.data.RestCallResult
+import org.evomaster.core.problem.rest.service.RestIndividualBuilder
 import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.BeforeEach
@@ -258,5 +259,36 @@ class CleanUpUUIDTest: IntegrationTestRestBase() {
     }
 
 
-    //TODO merge (various combinations)
+    @Test
+    fun testMergePost() {
+
+        assertEquals(0, CleanUpUUIDApplication.numberExistingData())
+
+        val pirTest = getPirToRest()
+
+        val postx = pirTest.fromVerbPath("post", "/api/resources")!!
+        val x = createIndividual(listOf(postx), SampleType.RANDOM)
+        val resx = x.evaluatedMainActions()[0].result as RestCallResult
+        assertEquals(201, resx.getStatusCode())
+        assertEquals(1, getReturnedSize(resx))
+
+        val posty = pirTest.fromVerbPath("post", "/api/resources")!!
+        val y = createIndividual(listOf(posty), SampleType.RANDOM)
+        val resy = y.evaluatedMainActions()[0].result as RestCallResult
+        assertEquals(201, resy.getStatusCode())
+        assertEquals(1, getReturnedSize(resy))
+
+        val m = getBuilder().merge(x.individual,y.individual)
+        assertEquals(2, m.size())
+
+        val z = getFitnessFunction().calculateCoverage(m)!!
+
+        assertEquals(2, z.evaluatedMainActions().size)
+        assertEquals(2, z.individual.seeMainExecutableActions().size)
+        assertEquals(2, z.individual.seeCleanUpActions().size)
+
+        //delete should had been automatically added
+        assertEquals(0, CleanUpUUIDApplication.numberExistingData())
+    }
+
 }

core/src/main/kotlin/org/evomaster/core/problem/rest/service/RestIndividualBuilder.kt

@@ -98,12 +98,17 @@ class RestIndividualBuilder {
      */
     fun merge(first: RestIndividual, second: RestIndividual): RestIndividual {
 
-        val before = first.seeAllActions().size + second.seeAllActions().size
+        val before = first.seeAllActions().size + second.seeAllActions().size -
+            //cleanup actions are going to be removed, as anyway automatically added
+            //when evaluating fitness... and check for duplicates is done there
+             first.seeCleanUpActions().size - second.seeCleanUpActions().size
 
         val base = first.copy() as RestIndividual
         base.ensureFlattenedStructure()
+        base.removeAllCleanUp()
         val other = second.copy() as RestIndividual
         other.ensureFlattenedStructure()
+        other.removeAllCleanUp()
 
         /*
             we need to reset local ids in other, to avoid clashes with ids in base.