From cbf3d9e2720d0a05a9c5f334f74df90e8b777618 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Wed, 24 Jul 2013 09:27:26 +0200 Subject: [PATCH] Fix some quality flaws --- .../sonar/core/persistence/DryRunDatabaseFactoryTest.java | 7 +++---- sonar-core/src/test/resources/logback-test.xml | 5 +++++ .../main/java/org/sonar/server/startup/RegisterRules.java | 2 -- 3 files changed, 8 insertions(+), 6 deletions(-) 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 f430aa71771..46be722f497 100644 --- 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 9c0d4b1c3ba..5ff4cdd214e 100644 --- a/sonar-core/src/test/resources/logback-test.xml +++ b/sonar-core/src/test/resources/logback-test.xml @@ -24,6 +24,11 @@ + + + + + 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 2078f996fd4..6679e13aa11 100644 --- 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 findAllRules(DatabaseSession session) { -- 2.39.5