Speed-up tests with Oracle

diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/AbstractDaoTestCase.java b/sonar-core/src/test/java/org/sonar/core/persistence/AbstractDaoTestCase.java
index bad01424dfdbcb8830ea0afd5388f7dcbc492710..bd4f2912449598f96c78c14327a9b4c2672ca931 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/core/persistence/AbstractDaoTestCase.java
+++ b/sonar-core/src/test/java/org/sonar/core/persistence/AbstractDaoTestCase.java
@@ -19,6 +19,7 @@
  */
 package org.sonar.core.persistence;
 
+import com.google.common.base.Objects;
 import com.google.common.collect.Maps;
 import com.google.common.io.Closeables;
 import org.apache.commons.io.FileUtils;
@@ -72,6 +73,7 @@ public abstract class AbstractDaoTestCase {
   private static Database database;
   private static DatabaseCommands databaseCommands;
   private static MyBatis myBatis;
+  private static String login;
 
   private IDatabaseTester databaseTester;
 
@@ -82,6 +84,7 @@ public abstract class AbstractDaoTestCase {
       if (settings.hasKey("orchestrator.configUrl")) {
         loadOrchestratorSettings(settings);
       }
+      login = settings.getString("sonar.jdbc.username");
       for (String key : settings.getKeysStartingWith("sonar.jdbc")) {
         LOG.info(key + ": " + settings.getString(key));
       }
@@ -103,7 +106,7 @@ public abstract class AbstractDaoTestCase {
   @Before
   public void startDbUnit() throws Exception {
     databaseCommands.truncateDatabase(database.getDataSource());
-    databaseTester = new DataSourceDatabaseTester(database.getDataSource());
+    databaseTester = new DataSourceDatabaseTester(database.getDataSource(), login);
   }
 
   /**

diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/DbTester.java b/sonar-core/src/test/java/org/sonar/core/persistence/DbTester.java
index 46b3f13d4993520e64c2492edaf4aaed14e1c99f..5c2a704d42572769ba98b3c6f4af983c083b0c50 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/core/persistence/DbTester.java
+++ b/sonar-core/src/test/java/org/sonar/core/persistence/DbTester.java
@@ -56,7 +56,11 @@ import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -95,6 +99,7 @@ public class DbTester extends ExternalResource {
     if (settings.hasKey("orchestrator.configUrl")) {
       loadOrchestratorSettings(settings);
     }
+    String login = settings.getString("sonar.jdbc.username");
     for (String key : settings.getKeysStartingWith("sonar.jdbc")) {
       LOG.info(key + ": " + settings.getString(key));
     }
@@ -117,7 +122,7 @@ public class DbTester extends ExternalResource {
     LOG.info("Test Database: " + db);
 
     commands = DatabaseCommands.forDialect(db.getDialect());
-    tester = new DataSourceDatabaseTester(db.getDataSource());
+    tester = new DataSourceDatabaseTester(db.getDataSource(), login);
 
     myBatis = new MyBatis(db, new Logback(), new NullQueue());
     myBatis.start();

diff --git a/sonar-core/src/test/java/org/sonar/jpa/test/AbstractDbUnitTestCase.java b/sonar-core/src/test/java/org/sonar/jpa/test/AbstractDbUnitTestCase.java
index 66dfb239887cb6a33a02cbe2c5141f0d98fb0a21..7eecf83d110905f67728a6460ac5b5257e4b3419 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/jpa/test/AbstractDbUnitTestCase.java
+++ b/sonar-core/src/test/java/org/sonar/jpa/test/AbstractDbUnitTestCase.java
@@ -55,7 +55,9 @@ import static org.junit.Assert.fail;
 
 /**
  * Heavily duplicates AbstractDaoTestCase as long as Hibernate is in use.
+ * @deprecated this class does not support non-H2 databases
  */
+@Deprecated
 public abstract class AbstractDbUnitTestCase {
   private static Database database;
   private static MyBatis myBatis;