From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Wed, 5 Nov 2014 13:31:32 +0000 (+0100)
Subject: Fix build (again)
X-Git-Tag: 5.0-RC1~396
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ce6e2fabf65e9b4ac18cff1c174b22977af665b5;p=sonarqube.git

Fix build (again)
---

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 e24f6d8ffe7..a6058ff7f05 100644
--- a/sonar-core/src/test/java/org/sonar/core/persistence/AbstractDaoTestCase.java
+++ b/sonar-core/src/test/java/org/sonar/core/persistence/AbstractDaoTestCase.java
@@ -95,6 +95,7 @@ public abstract class AbstractDaoTestCase {
 
   @Before
   public void startDbUnit() throws Exception {
+    databaseCommands.truncateDatabase(database.getDataSource());
     databaseTester = new DataSourceDatabaseTester(database.getDataSource());
     myBatis = new MyBatis(database, new Logback(), new NullQueue());
     myBatis.start();
@@ -144,7 +145,6 @@ public abstract class AbstractDaoTestCase {
   protected void setupData(String... testNames) {
     InputStream[] streams = new InputStream[testNames.length];
     try {
-      databaseCommands.truncateDatabase(database.getDataSource());
       for (int i = 0; i < testNames.length; i++) {
         String className = getClass().getName();
         className = String.format("/%s/%s.xml", className.replace(".", "/"), testNames[i]);
@@ -167,7 +167,6 @@ public abstract class AbstractDaoTestCase {
 
   private void setupData(InputStream... dataSetStream) {
     try {
-      databaseCommands.truncateDatabase(database.getDataSource());
       IDataSet[] dataSets = new IDataSet[dataSetStream.length];
       for (int i = 0; i < dataSetStream.length; i++) {
         dataSets[i] = getData(dataSetStream[i]);
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 dcb57f191b2..66dfb239887 100644
--- a/sonar-core/src/test/java/org/sonar/jpa/test/AbstractDbUnitTestCase.java
+++ b/sonar-core/src/test/java/org/sonar/jpa/test/AbstractDbUnitTestCase.java
@@ -82,6 +82,7 @@ public abstract class AbstractDbUnitTestCase {
 
   @Before
   public void startDbUnit() throws Exception {
+    databaseCommands.truncateDatabase(database.getDataSource());
     databaseTester = new DataSourceDatabaseTester(database.getDataSource());
     session = new JpaDatabaseSession(dbConnector);
     session.start();
@@ -120,7 +121,6 @@ public abstract class AbstractDbUnitTestCase {
   protected void setupData(String... testNames) {
     InputStream[] streams = new InputStream[testNames.length];
     try {
-      databaseCommands.truncateDatabase(database.getDataSource());
       for (int i = 0; i < testNames.length; i++) {
         String className = getClass().getName();
         className = String.format("/%s/%s.xml", className.replace(".", "/"), testNames[i]);
@@ -144,7 +144,6 @@ public abstract class AbstractDbUnitTestCase {
   private void setupData(InputStream... dataSetStream) {
     IDatabaseConnection connection = null;
     try {
-      databaseCommands.truncateDatabase(database.getDataSource());
       IDataSet[] dataSets = new IDataSet[dataSetStream.length];
       for (int i = 0; i < dataSetStream.length; i++) {
         dataSets[i] = getData(dataSetStream[i]);