Merge pull request #1456 from WebFuzzing/fix/solver-test-sql

Fix test

Author: arcuri82

core-tests/e2e-tests/spring/spring-rest-h2-z3solver/src/test/java/org/evomaster/e2etests/spring/h2/z3solver/Z3SolverEMTest.java

@@ -5,7 +5,6 @@
 import org.evomaster.core.problem.rest.data.RestIndividual;
 import org.evomaster.core.search.Solution;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -18,7 +17,6 @@ public static void initClass() throws Exception {
         SpringTestBase.initClass(new Z3SolverController());
     }
 
-    @Disabled("FIXME new invariants fail here... need to update solver code to handle them")
     @Test
     public void testRunEM() throws Throwable {
 

core/src/main/kotlin/org/evomaster/core/solver/SMTLibZ3DbConstraintSolver.kt

@@ -139,6 +139,13 @@ class SMTLibZ3DbConstraintSolver() : DbConstraintSolver {
             // Find table from schema and create SQL actions
             val table = findTableByName(schemaDto, tableName)
 
+            /*
+             * The invariant requires that action.insertionId == primaryKey.uniqueId (and same for FK).
+             * So we must use the same id for the action and all its PK/FK genes.
+             */
+            val actionId = idCounter
+            idCounter++
+
             // Create the list of genes with the values
             val genes = mutableListOf<Gene>()
             for (columnName in columns.fields) {
@@ -164,15 +171,13 @@ class SMTLibZ3DbConstraintSolver() : DbConstraintSolver {
                 }
                 val currentColumn = table.columns.firstOrNull(){ it.name.equals(columnName, ignoreCase = true) }
                 if (currentColumn != null &&  currentColumn.primaryKey) {
-                    gene = SqlPrimaryKeyGene(columnName, table.id, gene, idCounter)
-                    idCounter++
+                    gene = SqlPrimaryKeyGene(columnName, table.id, gene, actionId)
                 }
                 gene.markAllAsInitialized()
                 genes.add(gene)
             }
 
-            val sqlAction = SqlAction(table, table.columns, idCounter, genes.toList())
-            idCounter++
+            val sqlAction = SqlAction(table, table.columns, actionId, genes.toList())
             actions.add(sqlAction)
         }