Fix some quality flaws

diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/DryRunDatabaseFactoryTest.java b/sonar-core/src/test/java/org/sonar/core/persistence/DryRunDatabaseFactoryTest.java
index f430aa717715b94b40600c1fd0e440f2df0a5a5a..46be722f497946cd82545bb8209463e7d2b07a49 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/core/persistence/DryRunDatabaseFactoryTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/persistence/DryRunDatabaseFactoryTest.java
@@ -37,10 +37,9 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 public class DryRunDatabaseFactoryTest extends AbstractDaoTestCase {
-  private DryRunDatabaseFactory localDatabaseFactory;
-
-  private ServerFileSystem serverFileSystem = mock(ServerFileSystem.class);
-  private BasicDataSource dataSource;
+  DryRunDatabaseFactory localDatabaseFactory;
+  ServerFileSystem serverFileSystem = mock(ServerFileSystem.class);
+  BasicDataSource dataSource;
 
   @Rule
   public TemporaryFolder temporaryFolder = new TemporaryFolder();

diff --git a/sonar-core/src/test/resources/logback-test.xml b/sonar-core/src/test/resources/logback-test.xml
index 9c0d4b1c3ba8133d82b23fed3aa8285d054189e3..5ff4cdd214ec668b9d2eaa53acc8d9ca1141964f 100644 (file)
--- a/sonar-core/src/test/resources/logback-test.xml
+++ b/sonar-core/src/test/resources/logback-test.xml
@@ -24,6 +24,11 @@
     <level value="WARN"/>
   </logger>
 
+  <!-- required for DryRunDatabaseFactoryTest -->
+  <logger name="org.sonar.core.persistence.DryRunDatabaseFactory">
+    <level value="DEBUG"/>
+  </logger>
+
   <root>
     <level value="INFO"/>
     <appender-ref ref="STDOUT"/>

diff --git a/sonar-server/src/main/java/org/sonar/server/startup/RegisterRules.java b/sonar-server/src/main/java/org/sonar/server/startup/RegisterRules.java
index 2078f996fd4cc0df89363912576bb94a9cc59a21..6679e13aa11dd4727693aa878ba69e4ef59a195e 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/startup/RegisterRules.java
+++ b/sonar-server/src/main/java/org/sonar/server/startup/RegisterRules.java
@@ -75,8 +75,6 @@ public final class RegisterRules {
     disableDeprecatedRepositories(existingRules, session);
 
     session.commit();
-
-    //notifyForRemovedRules(existingRules);
   }
 
   private List<Rule> findAllRules(DatabaseSession session) {