completed E2E for named examples

Author: arcuri82

core-tests/e2e-tests/spring/spring-rest-openapi-v3/src/main/kotlin/com/foo/rest/examples/spring/openapi/v3/namedexample/NamedExampleApplication.kt

@@ -38,6 +38,6 @@ open class NamedExampleApplication {
 
         //on purpose do nothing with input... should still be selected in test suites due to BB coverage
 
-        return ResponseEntity.ok("Hello World!!!")
+        return ResponseEntity.ok("OK")
     }
-}
+}

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

@@ -1,7 +1,9 @@
 package org.evomaster.e2etests.spring.openapi.v3.namedexample
 
 import com.foo.rest.examples.spring.openapi.v3.namedexample.NamedExampleController
+import junit.framework.TestCase.assertTrue
 import org.evomaster.core.problem.rest.data.HttpVerb
+import org.evomaster.core.search.service.IdMapper
 import org.evomaster.e2etests.spring.openapi.v3.SpringTestBase
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeAll
@@ -24,12 +26,16 @@ class NamedExampleEMTest : SpringTestBase(){
             200,
         ) { args: MutableList<String> ->
 
-            val solution = initAndRun(args)
+            val (injector, solution) = initAndDebug(args)
 
             Assertions.assertTrue(solution.individuals.size >= 1)
-            assertHasAtLeastOne(solution, HttpVerb.POST, 200, "/object", "OK")
+            assertHasAtLeastOne(solution, HttpVerb.POST, 200, "/api/namedexample", "OK")
 
-            TODO add checks on named example target
+            val fv = solution.overall
+
+            val idMapper = injector.getInstance(IdMapper::class.java)
+            val covered = fv.coveredTargets().any{ IdMapper.isNamedExample(idMapper.getDescriptiveId(it))}
+            Assertions.assertTrue(covered)
         }
     }
 

core-tests/integration-tests/core-it/src/test/kotlin/org/evomaster/core/mutatortest/OneMaxMutator.kt

@@ -105,7 +105,7 @@ class OneMaxMutator {
         m.close()
 
         val tp = reportFP(config.mutatedGeneFile, improve)
-        val covered = solution.overall.coveredTargets() * 1.0 /n
+        val covered = solution.overall.numberOfCoveredTargets() * 1.0 /n
 
         val result = Pair(tp, covered)
         map.getOrPut(expId){ mutableListOf()}.add(result)
@@ -125,4 +125,4 @@ class OneMaxMutator {
 
 fun main(array: Array<String>){
     OneMaxMutator().mutatorExp()
-}
+}

core/src/main/kotlin/org/evomaster/core/output/TestSuiteOrganizer.kt

@@ -191,7 +191,7 @@ class SortingHelper {
      * The purpose is to give an example of sorting based on fitness information.
      */
     private val coveredTargets: Comparator<EvaluatedIndividual<*>> = compareBy {
-        it.fitness.coveredTargets()
+        it.fitness.numberOfCoveredTargets()
     }
 
     /**

core/src/main/kotlin/org/evomaster/core/output/service/TestSuiteWriter.kt

@@ -338,7 +338,7 @@ class TestSuiteWriter {
 
         lines.addBlockCommentLine(" The generated test suite contains ${solution.individuals.size} tests")
         classDescriptionEmptyLine(lines)
-        lines.addBlockCommentLine(" Covered targets: ${solution.overall.coveredTargets()}")
+        lines.addBlockCommentLine(" Covered targets: ${solution.overall.numberOfCoveredTargets()}")
         classDescriptionEmptyLine(lines)
         lines.addBlockCommentLine(" Used time: ${searchTimeController.getElapsedTime()}")
         classDescriptionEmptyLine(lines)

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

@@ -541,7 +541,7 @@ abstract class AbstractRestFitness : HttpWsFitness<RestIndividual>() {
                 continue
             }
 
-            val target = "NAMED_EXAMPLE_${call.id}_${e.key}"
+            val target = idMapper.getNamedExampleId(call.id, e.key, status ?: 0)
             fv.coverTarget(idMapper.handleLocalTarget(target))
         }
     }

core/src/main/kotlin/org/evomaster/core/search/FitnessValue.kt

@@ -1,7 +1,6 @@
 package org.evomaster.core.search
 
 import com.webfuzzing.commons.faults.DefinedFaultCategory
-import com.webfuzzing.commons.faults.FaultCategory
 import org.evomaster.client.java.controller.api.dto.BootTimeInfoDto
 import org.evomaster.client.java.controller.api.dto.database.execution.MongoFailedQuery
 import org.evomaster.core.EMConfig
@@ -200,11 +199,18 @@ class FitnessValue(
         return targets.filterKeys { targetIds.contains(it)}.values.map { h -> h.score }.sum()
     }
 
-    fun coveredTargets(): Int {
+    fun coveredTargets() : Set<Int> {
+        return targets.entries
+            .filter { it.value.score == MAX_VALUE }
+            .map { it.key }
+            .toSet()
+    }
+
+    fun numberOfCoveredTargets(): Int {
         return targets.values.count { t -> t.score == MAX_VALUE }
     }
 
-    fun coveredTargets(prefix: String, idMapper: IdMapper) : Int{
+    fun numberOfCoveredTargets(prefix: String, idMapper: IdMapper) : Int{
 
         return targets.entries
                 .filter { it.value.score == MAX_VALUE }
@@ -253,7 +259,7 @@ class FitnessValue(
      */
     fun unionWithBootTimeCoveredTargets(prefix: String?, idMapper: IdMapper, bootTimeInfoDto: BootTimeInfoDto?): TargetStatistic{
         if (bootTimeInfoDto?.targets == null){
-            return (if (prefix == null) coveredTargets() else coveredTargets(prefix, idMapper)).run {
+            return (if (prefix == null) numberOfCoveredTargets() else numberOfCoveredTargets(prefix, idMapper)).run {
                 TargetStatistic(
                     bootTime = BOOT_TIME_INFO_UNAVAILABLE,
                     searchTime = this - coveredTargetsDuringSeeding(),

core/src/main/kotlin/org/evomaster/core/search/gene/collection/EnumGene.kt

@@ -260,7 +260,8 @@ class EnumGene<T : Comparable<T>>(
 
     override fun containsSameValueAs(other: Gene): Boolean {
         if (other !is EnumGene<*>) {
-            throw IllegalArgumentException("Invalid gene type ${other.javaClass}")
+            return false // FIXME
+            //throw IllegalArgumentException("Invalid gene type ${other.javaClass}")
         }
         //FIXME what if compared to another enum with different values???
         return this.index == other.index

core/src/main/kotlin/org/evomaster/core/search/service/IdMapper.kt

@@ -20,10 +20,15 @@ class IdMapper {
 
         private const val FAULT_OBJECTIVE_PREFIX = "PotentialFault"
 
+        private const val NAMED_EXAMPLE = "NamedExample"
+
         /**
          * local objective prefix might depend on problems, eg, HTTP_SUCCESS and HTTP_FAULT for REST
          * it can be identified with its numeric id, ie, less than 0
          * however we need this key to specify whether to consider such objectives in impact collections
+         *
+         * TODO is this verified anywhere? eg, i think we created many new local targets not using this...
+         * TODO if this is still relevant, should be enforced in an invariant somewhere
          */
         const val LOCAL_OBJECTIVE_KEY = "Local"
 
@@ -43,6 +48,8 @@ class IdMapper {
         private const val GQL_NO_ERRORS = "GQL_NO_ERRORS"
 
 
+        fun isNamedExample(descriptiveId: String) = descriptiveId.startsWith(NAMED_EXAMPLE)
+
         fun isFault(descriptiveId: String) = descriptiveId.startsWith(FAULT_OBJECTIVE_PREFIX)
 
         fun isSpecifiedFault(descriptiveId: String, category: FaultCategory) =
@@ -101,6 +108,10 @@ class IdMapper {
         return "$FAULT_OBJECTIVE_PREFIX ${category.label} $postfix"
     }
 
+    fun getNamedExampleId(actionId: String, exampleName: String, statusCode: Int) : String {
+        return "$NAMED_EXAMPLE $actionId - $exampleName - $statusCode"
+    }
+
     fun getGQLNoErrors(method: String) = "$GQL_NO_ERRORS:$method"
 
     fun getHandledRPC(postfix: String): String {
@@ -133,4 +144,4 @@ class IdMapper {
     fun isRPCHandledAndSuccess(id: Int) = mapping[id]?.let { isRPCHandledAndSuccess(it) } == true
 
 
-}
+}

core/src/main/kotlin/org/evomaster/core/search/service/Sampler.kt

@@ -163,7 +163,11 @@ abstract class Sampler<T> : TrackOperator where T : Individual {
 
         //we look at something already selected, with more than 1 occurrence, and not fully used yet
         val options = inUse.filter { candidates.contains(it.key) }
-        assert(options.isNotEmpty())
+        if(options.isEmpty()){
+            //this can happen when there is a selected named example with a single occurrence in the schema.
+            //so, nothing to do
+            return
+        }
 
         val choice = randomness.choose(options.keys)