fixed all remaining issues in GeneRandomizedTest

Author: arcuri82

core/src/main/kotlin/org/evomaster/core/search/gene/Gene.kt

@@ -876,12 +876,16 @@ abstract class Gene(
     /**
      * Genes might contain a value that is also stored
      * in another gene of the same type.
+     *
+     * If the type of [other] is different, this method might throw an [IllegalArgumentException]
+     *
+     * TODO refactor, in which type-check is done here
      */
     abstract fun containsSameValueAs(other: Gene): Boolean
 
 
     /**
-     * evaluate whether [this] and [gene] belong to one evolution during search
+     * evaluate whether `this` and [gene] belong to one evolution during search
      */
     open fun possiblySame(gene: Gene): Boolean = gene.name == name && gene::class == this::class
 

core/src/main/kotlin/org/evomaster/core/search/gene/SeededGene.kt

@@ -114,15 +114,14 @@ class SeededGene<T>(
         if (other !is SeededGene<*>)
            return false
 
+        this.employSeeded = other.employSeeded
+        this.isEmploySeededMutable = other.isEmploySeededMutable
+
         val ok = if (employSeeded)
             this.seeded.unsafeCopyValueFrom(other.seeded)
         else
             this.gene.unsafeCopyValueFrom(other.gene as Gene)
 
-        if (ok){
-            this.employSeeded = other.employSeeded
-            this.isEmploySeededMutable = other.isEmploySeededMutable
-        }
         return ok
     }
 

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

@@ -243,7 +243,14 @@ abstract class MapGene<K, V>(
             TODO support other types if needed
          */
         if (isElementApplicableToUniqueCheck(geneValue)){
-            return elements.filter { ParamUtil.getValueGene(it.first).containsSameValueAs(ParamUtil.getValueGene(geneValue)) }
+            return elements.filter {
+                try {
+                    //TODO need refactoring/cleanup... should avoid try/catch
+                    ParamUtil.getValueGene(it.first).containsSameValueAs(ParamUtil.getValueGene(geneValue))
+                }catch (e: Exception){
+                    false
+                }
+            }
         }
         return listOf()
     }

core/src/main/kotlin/org/evomaster/core/search/gene/regex/PatternCharacterBlockGene.kt

@@ -50,7 +50,7 @@ class PatternCharacterBlockGene(
 
     override fun containsSameValueAs(other: Gene): Boolean {
         if (other !is PatternCharacterBlockGene) {
-            throw IllegalArgumentException("Invalid gene type ${other.javaClass}")
+            return false
         }
         return this.stringBlock == other.stringBlock
     }

core/src/main/kotlin/org/evomaster/core/search/gene/sql/SqlAutoIncrementGene.kt

@@ -58,7 +58,13 @@ class SqlAutoIncrementGene(name: String) : SimpleGene(name) {
         if (other !is SqlAutoIncrementGene) {
             return false
         }
-        return this === other
+
+        /*
+            auto-increment are always unique... but need to satisfy invariants on copyFrom...
+            TODO  might check for side-effects, and see if need more complex handling
+         */
+        //return this === other
+        return true
     }
 
     override fun isMutable() = false

core/src/main/kotlin/org/evomaster/core/search/gene/sql/SqlForeignKeyGene.kt

@@ -142,6 +142,11 @@ class SqlForeignKeyGene(
         return true
     }
 
+    override fun isPrintable(): Boolean {
+        //TODO what about pk? anyway, likely PK/FK will need a major overhaul...
+        return isBound() || nullable
+    }
+
     override fun getValueAsPrintableString(previousGenes: List<Gene>, mode: GeneUtils.EscapeMode?, targetFormat: OutputFormat?, extraCheck: Boolean): String {
 
         if (!isBound()) {

core/src/main/kotlin/org/evomaster/core/search/gene/sql/SqlRangeGene.kt

@@ -92,6 +92,11 @@ class SqlRangeGene<T>(
         if (other !is SqlRangeGene<*>) {
             throw IllegalArgumentException("Invalid gene type ${other.javaClass}")
         }
+
+        if(this.template.javaClass != other.template.javaClass) {
+            return false
+        }
+
         return isLeftClosed.containsSameValueAs(other.isLeftClosed)
                 && left.containsSameValueAs(other.left as Gene)
                 && right.containsSameValueAs(other.right as Gene)

core/src/main/kotlin/org/evomaster/core/search/gene/wrapper/ChoiceGene.kt

@@ -199,6 +199,20 @@ class ChoiceGene<T>(
             TODO this is bit limited... what about if there are wrapper genes involved?
         */
 
+        //first check if can find gene of same type
+        for(i in geneChoices.indices){
+            val g = geneChoices[i]
+
+            if(g.javaClass == x.javaClass) {
+                val updated = g.copyValueFrom(x)
+                if (updated) {
+                    this.activeGeneIndex = i
+                    return true
+                }
+            }
+        }
+
+        //if none found, check at any other possibly compatible types
         for(i in geneChoices.indices){
             val g = geneChoices[i]
 
@@ -208,11 +222,12 @@ class ChoiceGene<T>(
                 of them would be fine. also if one works, we should not break validity of the other
                 options even if not selected
              */
-            val updated = g.copyValueFrom(x)
-            g.forceNewTaints()
-            if(updated){
-                this.activeGeneIndex = i
-                return true
+            if(g.javaClass != x.javaClass) {
+                val updated = g.copyValueFrom(x)
+                if (updated) {
+                    this.activeGeneIndex = i
+                    return true
+                }
             }
         }
 
@@ -240,12 +255,9 @@ class ChoiceGene<T>(
         if (other !is ChoiceGene<*>) {
             throw IllegalArgumentException("Invalid gene type ${other.javaClass}")
         }
-        if (this.activeGeneIndex != other.activeGeneIndex) {
-            return false
-        }
 
-        return this.geneChoices[activeGeneIndex]
-            .containsSameValueAs(other.geneChoices[activeGeneIndex])
+        return this.activeGene().javaClass == other.activeGene().javaClass
+                && this.activeGene().containsSameValueAs(other.activeGene())
     }
 
     /**

core/src/test/kotlin/org/evomaster/core/search/gene/GeneRandomizedTest.kt

@@ -64,6 +64,9 @@ class GeneRandomizedTest : AbstractGeneTest(){
             val sx = x.getValueAsRawString()
 
             val y = x.copy().apply { randomize(rand, true) }
+            if(!y.isPrintable()){
+                return@forEach
+            }
             val sy = y.getValueAsRawString()
 
             if (sx == sy) {

core/src/test/kotlin/org/evomaster/core/search/gene/GeneSamplerForTests.kt

@@ -481,10 +481,13 @@ object GeneSamplerForTests {
 
         //TODO update after refactoring SeededGene with ChoiceGene (to implement)
 
+        val seeds = EnumGene<StringGene>("rand EnumGene ${rand.nextInt()}",
+            listOf(StringGene("A"), StringGene("B"), StringGene("C")))
+
         return SeededGene(
                 name = "rand SeededGene",
                 gene = sampleStringGene(rand),
-                seeded = sampleEnumGene(rand) as EnumGene<StringGene>,
+                seeded = seeds,
                 employSeeded = rand.nextBoolean()
         )
     }