patio

Author: man-zhang

jdk_11_gradle/em/embedded/graphql/patio-api/src/main/java/em/embedded/patio/EmbeddedEvoMasterController.java

@@ -9,6 +9,7 @@
 import org.evomaster.client.java.controller.api.dto.SutInfoDto;
 import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
 import org.evomaster.client.java.controller.db.DbCleaner;
+import org.evomaster.client.java.controller.db.SqlScriptRunner;
 import org.evomaster.client.java.controller.db.SqlScriptRunnerCached;
 import org.evomaster.client.java.controller.internal.SutController;
 import org.evomaster.client.java.controller.internal.db.DbSpecification;
@@ -17,6 +18,8 @@
 import org.testcontainers.containers.GenericContainer;
 import patio.Application;
 
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
@@ -43,6 +46,10 @@ public static void main(String[] args){
     private Connection sqlConnection;
     private List<DbSpecification> dbSpecification;
 
+    private final String INIT_DB_SCRIPT_PATH = "/initDB.sql";
+
+    private String initSQLScript;
+
     private final int portApp = 8080; //Hardcoded. will need fixing
     // TODO maybe report at https://github.com/micronaut-projects/micronaut-core/issues
 
@@ -62,6 +69,12 @@ public EmbeddedEvoMasterController() {
 
     public EmbeddedEvoMasterController(int port) {
         setControllerPort(port);
+
+        try (InputStream in = getClass().getResourceAsStream(INIT_DB_SCRIPT_PATH)) {
+            initSQLScript = String.join(System.lineSeparator(), (new SqlScriptRunner()).readCommands(new InputStreamReader(in)));
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
 
 
@@ -94,9 +107,13 @@ public String startSut() {
             throw new RuntimeException(e);
         }
 
+        /*
+                ensure the data is empty
+             */
+        DbCleaner.clearDatabase_Postgres(sqlConnection, "public", List.of("flyway_schema_history"));
+
         dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.POSTGRES,sqlConnection)
-                .withSchemas("public").withDisabledSmartClean());
-        //            initSqlOnResourcePath = "/initDb.sql";
+                .withSchemas("public").withInitSqlScript(initSQLScript));
 
         return "http://localhost:" + getSutPort();
     }
@@ -128,8 +145,8 @@ public String getPackagePrefixesToCover() {
 
     @Override
     public void resetStateOfSUT() {
-        DbCleaner.clearDatabase_Postgres(sqlConnection, "public", List.of("flyway_schema_history"));
-        SqlScriptRunnerCached.runScriptFromResourceFile(sqlConnection,"/initDB.sql");
+//        DbCleaner.clearDatabase_Postgres(sqlConnection, "public", List.of("flyway_schema_history"));
+//        SqlScriptRunnerCached.runScriptFromResourceFile(sqlConnection,"/initDB.sql");
     }
 
     @Override

jdk_11_gradle/em/external/graphql/patio-api/src/main/java/em/external/patio/ExternalEvoMasterController.java

@@ -7,12 +7,15 @@
 import org.evomaster.client.java.controller.api.dto.SutInfoDto;
 import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
 import org.evomaster.client.java.controller.db.DbCleaner;
+import org.evomaster.client.java.controller.db.SqlScriptRunner;
 import org.evomaster.client.java.controller.db.SqlScriptRunnerCached;
 import org.evomaster.client.java.controller.internal.db.DbSpecification;
 import org.evomaster.client.java.controller.problem.GraphQlProblem;
 import org.evomaster.client.java.controller.problem.ProblemInfo;
 import org.testcontainers.containers.GenericContainer;
 
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
@@ -65,6 +68,10 @@ public static void main(String[] args) {
     private Connection sqlConnection;
     private List<DbSpecification> dbSpecification;
 
+    private final String INIT_DB_SCRIPT_PATH = "/initDB.sql";
+
+    private String initSQLScript;
+
     private static final GenericContainer postgres = new GenericContainer("postgres:9")
             .withEnv("POSTGRES_HOST_AUTH_METHOD","trust")
             .withEnv("POSTGRES_DB", "patio")
@@ -95,6 +102,12 @@ public ExternalEvoMasterController(
         this.timeoutSeconds = timeoutSeconds;
         setControllerPort(controllerPort);
         setJavaCommand(command);
+
+        try (InputStream in = getClass().getResourceAsStream(INIT_DB_SCRIPT_PATH)) {
+            initSQLScript = String.join(System.lineSeparator(), (new SqlScriptRunner()).readCommands(new InputStreamReader(in)));
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
 
 
@@ -152,9 +165,14 @@ public void postStart() {
 
         try {
             sqlConnection = DriverManager.getConnection(dbUrl(), "patio", "patio");
+
+            /*
+                ensure the data is empty
+             */
+            DbCleaner.clearDatabase_Postgres(sqlConnection, "public", List.of("flyway_schema_history"));
+
             dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.POSTGRES,sqlConnection)
-                    .withSchemas("public").withDisabledSmartClean());
-            //                initSqlOnResourcePath = "/initDb.sql";
+                    .withSchemas("public").withInitSqlScript(initSQLScript));
 
         } catch (Exception e) {
             throw new RuntimeException(e);
@@ -163,8 +181,8 @@ public void postStart() {
 
     @Override
     public void resetStateOfSUT() {
-        DbCleaner.clearDatabase_Postgres(sqlConnection, "public", List.of("flyway_schema_history"));
-        SqlScriptRunnerCached.runScriptFromResourceFile(sqlConnection,"/initDB.sql");
+//        DbCleaner.clearDatabase_Postgres(sqlConnection, "public", List.of("flyway_schema_history"));
+//        SqlScriptRunnerCached.runScriptFromResourceFile(sqlConnection,"/initDB.sql");
     }
 
     @Override