fix problems on db configuration/reset

Author: man-zhang

jdk_8_maven/em/embedded/rest/catwatch/src/main/java/em/embedded/org/zalando/EmbeddedEvoMasterController.java

@@ -81,7 +81,6 @@ public String startSut() {
         dbSpecification = Arrays.asList(new DbSpecification(){{
             dbType = DatabaseType.H2;
             connection = sqlConnection;
-            schemaNames = Arrays.asList("schema_version");
         }});
 
         return "http://localhost:" + getSutPort();

jdk_8_maven/em/embedded/rest/proxyprint/src/main/java/em/embedded/io/github/proxyprint/kitchen/EmbeddedEvoMasterController.java

@@ -85,6 +85,7 @@ public String startSut() {
         dbSpecification = Arrays.asList(new DbSpecification(){{
             dbType = DatabaseType.H2;
             connection = sqlConnection;
+            employSmartDbClean = false;
         }});
 
         return "http://localhost:" + getSutPort();
@@ -114,7 +115,7 @@ public String getPackagePrefixesToCover() {
 
     @Override
     public void resetStateOfSUT() {
-//        DbCleaner.clearDatabase_H2(connection);
+        DbCleaner.clearDatabase_H2(sqlConnection);
 
         deleteDir(new File("./target/temp"));
 

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

@@ -43,7 +43,7 @@ public static void main(String[] args) {
 
     private ScoutAPIApplication application;
     private Connection sqlConnection;
-    private List<String> sqlCommands;
+    private final List<String> sqlCommands;
     private List<DbSpecification> dbSpecification;
 
     public EmbeddedEvoMasterController() {
@@ -90,8 +90,8 @@ public String startSut() {
 
         dbSpecification = Arrays.asList(new DbSpecification(){{
             dbType = DatabaseType.H2;
-            initSqlOnResourcePath = String.join("\n", sqlCommands);
             connection = sqlConnection;
+            employSmartDbClean = false;
         }});
 
         resetStateOfSUT();
@@ -137,8 +137,8 @@ public void resetStateOfSUT() {
 
         deleteDir(new File("./target/temp"));
 
-//        DbCleaner.clearDatabase_H2(connection);
-//        SqlScriptRunner.runCommands(connection, sqlCommands);
+        DbCleaner.clearDatabase_H2(sqlConnection);
+        SqlScriptRunner.runCommands(sqlConnection, sqlCommands);
     }
 
 

jdk_8_maven/em/external/rest/catwatch/src/main/java/em/external/org/zalando/ExternalEvoMasterController.java

@@ -150,7 +150,6 @@ public void postStart() {
             dbSpecification = Arrays.asList(new DbSpecification(){{
                 dbType = DatabaseType.H2;
                 connection = sqlConnection;
-                schemaNames = Arrays.asList("schema_version");
             }});
         } catch (Exception e) {
             throw new RuntimeException(e);

jdk_8_maven/em/external/rest/proxyprint/src/main/java/em/external/io/github/proxyprint/kitchen/ExternalEvoMasterController.java

@@ -158,6 +158,7 @@ public void postStart() {
             dbSpecification = Arrays.asList(new DbSpecification(){{
                 dbType = DatabaseType.H2;
                 connection = sqlConnection;
+                employSmartDbClean = false;
             }});
         } catch (Exception e) {
             throw new RuntimeException(e);
@@ -166,7 +167,7 @@ public void postStart() {
 
     @Override
     public void resetStateOfSUT() {
-//        DbCleaner.clearDatabase_H2(connection);
+        DbCleaner.clearDatabase_H2(sqlConnection);
 
         deleteDir(new File("./target/temp"));
 

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

@@ -75,7 +75,7 @@ public static void main(String[] args) {
 
     private Connection sqlConnection;
     private List<DbSpecification> dbSpecification;
-    private List<String> sqlCommands;
+    private final List<String> sqlCommands;
     private Server h2;
 
 
@@ -198,8 +198,8 @@ public void postStart() {
             sqlConnection = DriverManager.getConnection(dbUrl(), "sa", "");
             dbSpecification = Arrays.asList(new DbSpecification(){{
                 dbType = DatabaseType.H2;
-                initSqlOnResourcePath = String.join("\n", sqlCommands);
                 connection = sqlConnection;
+                employSmartDbClean = false;
             }});
         } catch (Exception e) {
             throw new RuntimeException(e);
@@ -230,8 +230,8 @@ public void resetStateOfSUT() {
 
         deleteDir(new File(tmpDir));
 
-//        DbCleaner.clearDatabase_H2(connection);
-//        SqlScriptRunner.runCommands(connection, sqlCommands);
+        DbCleaner.clearDatabase_H2(sqlConnection);
+        SqlScriptRunner.runCommands(sqlConnection, sqlCommands);
     }
 
     private void deleteDir(File file) {