Merge branch 'master' into feature/os-distance-operations

Author: arcuri82

core-tests/e2e-tests/spring/spring-rest-postgres/src/test/kotlin/org/evomaster/e2etests/spring/rest/postgres/columntypes/PostgresColumnTypesEMTest.kt

@@ -26,7 +26,7 @@ class PostgresColumnTypesEMTest : SpringRestPostgresTestBase() {
         runTestHandlingFlakyAndCompilation(
                 "PostgresColumnTypesEM",
                 "com.foo.spring.rest.postgres.columntypes.PostgresColumnTypesEM",
-                600
+                1_000
         ) { args ->
             args.add("--enableWeightBasedMutationRateSelectionForGene")
             args.add("false")

core-tests/e2e-tests/spring/spring-rpc-thrift/src/test/java/org/evomaster/e2etests/spring/rpc/examples/hypermutation/AdaptiveHypermutationEMTest.java

@@ -7,6 +7,7 @@
 import org.evomaster.core.search.Solution;
 import org.evomaster.e2etests.spring.rpc.examples.SpringRPCTestBase;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
@@ -26,6 +27,8 @@ public static void initClass() throws Exception {
         }}));
     }
 
+    //FIXME
+    @Disabled("This started failing... need fixing")
     @Test
     public void testRunEM() throws Throwable {
 

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

@@ -75,11 +75,10 @@ class SqlLogSeqNumberGene(
 
     override fun containsSameValueAs(other: Gene): Boolean {
         if (other !is SqlLogSeqNumberGene) {
-            throw IllegalArgumentException("Invalid gene type ${other.javaClass}")
+            return false
         }
         return leftPart.containsSameValueAs(other.leftPart)
                 && rightPart.containsSameValueAs(other.rightPart)
-
     }