Completely clear and rebuild the h2 database on reset

The sql backup procedure for the first run scenario writes the sequence lines without the "if not exists" clause, so subsequent runs can fail - especially after the user has executed some tests manually. Drop all items from the database and either restore a base from the backup or a complete database with test data.
zanata · Sep 10, 2013 · e97f4e5 · e97f4e5
1 parent cef83a5
commit e97f4e5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/functional-test/src/test/java/org/zanata/util/DatabaseHelper.java b/functional-test/src/test/java/org/zanata/util/DatabaseHelper.java
@@ -37,6 +37,7 @@ public class DatabaseHelper
    private static Statement statement;
    private static DatabaseHelper DB;
    private String backupPath;
+   private static int CURRENT_TABLE_COUNT = 76;
    private FluentWait<Statement> wait;
 
    private DatabaseHelper()
@@ -181,13 +182,21 @@ public void resetDatabaseWithData()
    {
       String path = getFileFromClasspath("org/zanata/feature/zanata_with_data.sql").getAbsolutePath();
       executeQuery("RUNSCRIPT FROM '" + path + "' CHARSET 'UTF-8'");
+      waitUntil("select count(*) from INFORMATION_SCHEMA.tables", CURRENT_TABLE_COUNT);
       waitUntil("select count(*) from HProjectIteration", 1);
    }
 
    public void resetData()
    {
       executeQuery("RUNSCRIPT FROM '" + backupPath + "' CHARSET 'UTF-8'");
       waitUntil("select count(*) from HProjectIteration", 0);
+      waitUntil("select count(*) from INFORMATION_SCHEMA.tables", CURRENT_TABLE_COUNT);
+   }
+
+   public void obliterateDatabase()
+   {
+      executeQuery("DROP ALL OBJECTS");
+      waitUntil("select count(*) from INFORMATION_SCHEMA.SEQUENCES", 0);
    }
 
    public void resetFileData()

diff --git a/functional-test/src/test/java/org/zanata/util/ResetDatabaseRule.java b/functional-test/src/test/java/org/zanata/util/ResetDatabaseRule.java
@@ -29,19 +29,18 @@ protected void before() throws Throwable
       }
 
       DatabaseHelper.database().resetFileData();
+      DatabaseHelper.database().obliterateDatabase();
 
       if (configSet.contains(Config.WithData))
       {
          DatabaseHelper.database().resetDatabaseWithData();
       }
       else
       {
-         log.info("reset database before");
          DatabaseHelper.database().resetData();
          DatabaseHelper.database().addAdminUser();
          DatabaseHelper.database().addTranslatorUser();
       }
-
    }
 
    private boolean isResetEnabled()
@@ -55,6 +54,7 @@ protected void after()
       // by default it will reset database after
       if (isResetEnabled() && !configSet.contains(Config.NoResetAfter))
       {
+         DatabaseHelper.database().obliterateDatabase();
          DatabaseHelper.database().resetData();
          log.info("reset database after");
       }