Revert "Fix execution of tests on non-H2 databases"

This reverts commit 34ac5d8.
SonarSource · Jul 6, 2015 · cc40fc4 · cc40fc4
1 parent 34ac5d8
commit cc40fc4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 17 deletions.
diff --git a/sonar-db/src/test/java/org/sonar/db/DbTester.java b/sonar-db/src/test/java/org/sonar/db/DbTester.java
@@ -96,15 +96,15 @@ public static DbTester createForSchema(System2 system2, Class testClass, String
 
   @Override
   protected void before() throws Throwable {
-    db.start();
+    truncateTables();
   }
 
   @Override
   protected void after() {
     if (session != null) {
       MyBatis.closeQuietly(session);
     }
-    db.stop();
+    db.close();
   }
 
   public DbSession getSession() {
@@ -323,8 +323,8 @@ public void assertDbUnit(Class testClass, String filename, String[] excludedColu
 
   public void assertColumnDefinition(String table, String column, int expectedType, @Nullable Integer expectedSize) {
     try (Connection connection = db.getDatabase().getDataSource().getConnection();
-         PreparedStatement stmt = connection.prepareStatement("select * from " + table);
+      PreparedStatement stmt = connection.prepareStatement("select * from " + table);
-         ResultSet res = stmt.executeQuery()) {
+      ResultSet res = stmt.executeQuery()) {
       Integer columnIndex = getColumnIndex(res, column);
       if (columnIndex == null) {
         fail("The column '" + column + "' does not exist");
@@ -336,7 +336,7 @@ public void assertColumnDefinition(String table, String column, int expectedType
       }
 
     } catch (Exception e) {
-      throw new IllegalStateException("Fail to check column", e);
+      throw new IllegalStateException("Fail to check column");
     }
   }
 
@@ -353,7 +353,7 @@ private Integer getColumnIndex(ResultSet res, String column) {
       return null;
 
     } catch (Exception e) {
-      throw new IllegalStateException("Fail to get column index", e);
+      throw new IllegalStateException("Fail to get column idnex");
     }
   }
 
@@ -387,7 +387,6 @@ private void closeQuietly(IDatabaseConnection connection) {
       }
     } catch (SQLException e) {
       // ignore
-      e.printStackTrace();
     }
   }
 
@@ -420,4 +419,8 @@ public Database database() {
     return db.getDatabase();
   }
 
+  public DatabaseCommands getCommands() {
+    return db.getCommands();
+  }
+
 }
diff --git a/sonar-db/src/test/java/org/sonar/db/TestDb.java b/sonar-db/src/test/java/org/sonar/db/TestDb.java
@@ -41,7 +41,6 @@
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 import org.sonar.db.deprecated.NullQueue;
-import org.sonar.db.dialect.H2;
 
 /**
  * This class should be call using @ClassRule in order to create the schema once (ft @Rule is used
@@ -92,11 +91,11 @@ private TestDb(@Nullable String schemaPath) {
       db.start();
       if (schemaPath != null) {
         // will fail if not H2
-        if (H2.ID.equals(db.getDialect().getId())) {
+        if (db.getDialect().getId().equals("h2")) {
           ((H2Database) db).executeScript(schemaPath);
         } else {
           db.stop();
-
+          throw new AssumptionViolatedException("Test disabled because it supports only H2");
         }
       }
       isDefault = (schemaPath == null);
@@ -110,12 +109,6 @@ private TestDb(@Nullable String schemaPath) {
     }
   }
 
-  void start() {
-    if (!isDefault && !H2.ID.equals(db.getDialect().getId())) {
-      throw new AssumptionViolatedException("Test disabled because it supports only H2");
-    }
-  }
-
   void truncateTables() {
     try {
       commands.truncateDatabase(db.getDataSource());
@@ -124,7 +117,7 @@ void truncateTables() {
     }
   }
 
-  void stop() {
+  void close() {
     if (!isDefault) {
       db.stop();
     }