enable smart db clean for scout api

Author: man-zhang

jdk_8_maven/em/embedded/rest/scout-api/src/main/java/em/embedded/se/devscout/scoutapi/EmbeddedEvoMasterController.java

@@ -43,18 +43,24 @@ public static void main(String[] args) {
 
     private ScoutAPIApplication application;
     private Connection sqlConnection;
-    private final List<String> sqlCommands;
+//    private final List<String> sqlCommands;
+
+    private String INIT_DB_SCRIPT_PATH = "/init_db.sql";
+
     private List<DbSpecification> dbSpecification;
 
+    private String initSQLScript;
+
+
     public EmbeddedEvoMasterController() {
         this(40100);
     }
 
     public EmbeddedEvoMasterController(int port) {
         setControllerPort(port);
 
-        try (InputStream in = getClass().getResourceAsStream("/init_db.sql")) {
-            sqlCommands = (new SqlScriptRunner()).readCommands(new InputStreamReader(in));
+        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);
         }
@@ -88,8 +94,13 @@ public String startSut() {
 
         sqlConnection = application.getConnection();
 
+        /*
+            ensure that the database is clean
+         */
+        DbCleaner.clearDatabase_H2(sqlConnection);
+
         dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.H2,sqlConnection)
-                .withDisabledSmartClean());
+                .withInitSqlScript(initSQLScript));
 
         resetStateOfSUT();
 
@@ -134,8 +145,8 @@ public void resetStateOfSUT() {
 
         deleteDir(new File("./target/temp"));
 
-        DbCleaner.clearDatabase_H2(sqlConnection);
-        SqlScriptRunner.runCommands(sqlConnection, sqlCommands);
+//        DbCleaner.clearDatabase_H2(sqlConnection);
+//        SqlScriptRunner.runCommands(sqlConnection, sqlCommands);
     }
 
 

jdk_8_maven/em/external/rest/scout-api/src/main/java/em/external/se/devscout/scoutapi/ExternalEvoMasterController.java

@@ -75,7 +75,11 @@ public static void main(String[] args) {
 
     private Connection sqlConnection;
     private List<DbSpecification> dbSpecification;
-    private final List<String> sqlCommands;
+//    private final List<String> sqlCommands;
+
+    private String INIT_DB_SCRIPT_PATH = "/init_db.sql";
+
+    private String initSQLScript;
     private Server h2;
 
 
@@ -105,7 +109,7 @@ public ExternalEvoMasterController(int controllerPort,
         createConfigurationFile();
 
         try(InputStream in = getClass().getResourceAsStream("/init_db.sql")) {
-            sqlCommands = (new SqlScriptRunner()).readCommands(new InputStreamReader(in));
+            initSQLScript = String.join(System.lineSeparator(), (new SqlScriptRunner()).readCommands(new InputStreamReader(in)));
         } catch (Exception e){
             throw new RuntimeException(e);
         }
@@ -196,8 +200,14 @@ public void postStart() {
         try {
             Class.forName("org.h2.Driver");
             sqlConnection = DriverManager.getConnection(dbUrl(), "sa", "");
-            dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.H2,sqlConnection)
-                    .withDisabledSmartClean());
+
+            /*
+                ensure that the database is clean
+             */
+            DbCleaner.clearDatabase_H2(sqlConnection);
+
+            dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.H2,sqlConnection).withInitSqlScript(initSQLScript));
+
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
@@ -227,8 +237,8 @@ public void resetStateOfSUT() {
 
         deleteDir(new File(tmpDir));
 
-        DbCleaner.clearDatabase_H2(sqlConnection);
-        SqlScriptRunner.runCommands(sqlConnection, sqlCommands);
+//        DbCleaner.clearDatabase_H2(sqlConnection);
+//        SqlScriptRunner.runCommands(sqlConnection, sqlCommands);
     }
 
     private void deleteDir(File file) {