Remove INFO logs in unit tests and fix Oracle tests

diff --git a/sonar-core/src/test/java/org/sonar/persistence/dao/DaoTestCase.java b/sonar-core/src/test/java/org/sonar/persistence/dao/DaoTestCase.java
index ffccfd185f1c1a940ce5ed4c501b91989ce1cd3f..9b4f75e0cbf3144fe1bd63974a85be73fdab7fe9 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/persistence/dao/DaoTestCase.java
+++ b/sonar-core/src/test/java/org/sonar/persistence/dao/DaoTestCase.java
@@ -31,7 +31,6 @@ import org.dbunit.dataset.filter.DefaultColumnFilter;
 import org.dbunit.dataset.xml.FlatXmlDataSet;
 import org.dbunit.operation.DatabaseOperation;
 import org.junit.*;
-import org.slf4j.LoggerFactory;
 import org.sonar.api.config.Settings;
 import org.sonar.persistence.*;
 
@@ -99,7 +98,6 @@ public abstract class DaoTestCase {
     for (String table : DatabaseUtils.TABLE_NAMES) {
       // 1. truncate
       String truncateCommand = databaseCommands.truncate(table);
-      LoggerFactory.getLogger(getClass()).info("Execute: " + truncateCommand);
       statement.executeUpdate(truncateCommand);
       connection.commit();
 

diff --git a/sonar-core/src/test/java/org/sonar/persistence/dao/DatabaseCommands.java b/sonar-core/src/test/java/org/sonar/persistence/dao/DatabaseCommands.java
index 0e4899bb9a1d8de3dbbf32c58d3f3963ff90077f..7bf85bb5334b918184b9b6d297ef6a4632fe1c13 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/persistence/dao/DatabaseCommands.java
+++ b/sonar-core/src/test/java/org/sonar/persistence/dao/DatabaseCommands.java
@@ -44,7 +44,6 @@ abstract class DatabaseCommands {
   }
 
 
-  
   static final DatabaseCommands DERBY = new DatabaseCommands(new DefaultDataTypeFactory()) {
     @Override
     String truncate(String table) {
@@ -56,7 +55,7 @@ abstract class DatabaseCommands {
       return "ALTER TABLE " + table + " ALTER COLUMN ID RESTART WITH 1";
     }
   };
-  
+
   static final DatabaseCommands MSSQL = new DatabaseCommands(new MsSqlDataTypeFactory()) {
     @Override
     String truncate(String table) {
@@ -89,7 +88,7 @@ abstract class DatabaseCommands {
 
     @Override
     String resetPrimaryKey(String table) {
-      return "ALTER SEQUENCE " + table + "_SEQ INCREMENT BY - MINVALUE 1;";
+      return "ALTER SEQUENCE " + table + "_SEQ INCREMENT BY 1 MINVALUE 1";
     }
   };