Remove useless constructors with System2.INSTANCE

5 files changed, 9 insertions, 6 deletions

diff --git a/sonar-server/src/test/java/org/sonar/server/db/DbClientTest.java b/sonar-server/src/test/java/org/sonar/server/db/DbClientTest.java
index 4aa9465b4f5..a6e3c3713d5 100644
--- a/sonar-server/src/test/java/org/sonar/server/db/DbClientTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/db/DbClientTest.java
@@ -39,9 +39,9 @@ public class DbClientTest {
   @Test
   public void facade() throws Exception {
     MyBatis myBatis = db.myBatis();
-    RuleDao ruleDao = new RuleDao();
+    RuleDao ruleDao = new RuleDao(System2.INSTANCE);
     QualityProfileDao qualityProfileDao = new QualityProfileDao(myBatis, System2.INSTANCE);
-    ActiveRuleDao activeRuleDao = new ActiveRuleDao(qualityProfileDao, ruleDao);
+    ActiveRuleDao activeRuleDao = new ActiveRuleDao(qualityProfileDao, ruleDao, System2.INSTANCE);
 
     DbClient client = new DbClient(db.database(), myBatis, ruleDao, activeRuleDao, qualityProfileDao);
 
diff --git a/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/IssueChangelogMigrationTest.java b/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/IssueChangelogMigrationTest.java
index f55925542b6..931bc6a12f0 100644
--- a/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/IssueChangelogMigrationTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/IssueChangelogMigrationTest.java
@@ -56,7 +56,7 @@ public class IssueChangelogMigrationTest {
 
     WorkDurationConvertor convertor = new WorkDurationConvertor(propertiesDao);
     convertor.init();
-    migration = new IssueChangelogMigration(db.database(), convertor, system2);
+    migration = new IssueChangelogMigration(db.database(), system2, convertor);
   }
 
   @Test
diff --git a/sonar-server/src/test/java/org/sonar/server/measure/persistence/MeasureDaoTest.java b/sonar-server/src/test/java/org/sonar/server/measure/persistence/MeasureDaoTest.java
index be4b2e00ed8..c6c2027e46c 100644
--- a/sonar-server/src/test/java/org/sonar/server/measure/persistence/MeasureDaoTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/measure/persistence/MeasureDaoTest.java
@@ -23,6 +23,7 @@ package org.sonar.server.measure.persistence;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.sonar.api.utils.System2;
 import org.sonar.core.measure.db.MeasureDto;
 import org.sonar.core.measure.db.MeasureKey;
 import org.sonar.core.persistence.AbstractDaoTestCase;
@@ -42,7 +43,7 @@ public class MeasureDaoTest extends AbstractDaoTestCase {
   @Before
   public void createDao() {
     session = getMyBatis().openSession(false);
-    dao = new MeasureDao();
+    dao = new MeasureDao(System2.INSTANCE);
   }
 
   @After
diff --git a/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java b/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java
index 416606b49cd..ab9df337f33 100644
--- a/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java
@@ -21,6 +21,7 @@
 package org.sonar.server.rule;
 
 import com.google.common.collect.ImmutableMap;
+import org.apache.commons.lang.time.DateUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.ClassRule;
@@ -189,7 +190,7 @@ public class RegisterRulesMediumTest {
 
     // Verify rule has not been updated
     Rule customRuleReloaded = index.getByKey(RuleTesting.XOO_X1);
-    assertThat(customRuleReloaded.updatedAt()).isEqualTo(updatedAt);
+    assertThat(DateUtils.isSameInstant(customRuleReloaded.updatedAt(), updatedAt));
   }
 
   @Test
diff --git a/sonar-server/src/test/java/org/sonar/server/rule/RuleOperationsTest.java b/sonar-server/src/test/java/org/sonar/server/rule/RuleOperationsTest.java
index f7b8b8070ac..b11dcc0f29d 100644
--- a/sonar-server/src/test/java/org/sonar/server/rule/RuleOperationsTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/rule/RuleOperationsTest.java
@@ -28,6 +28,7 @@ import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.sonar.api.rule.RuleKey;
+import org.sonar.api.utils.System2;
 import org.sonar.core.permission.GlobalPermissions;
 import org.sonar.core.persistence.DbSession;
 import org.sonar.core.rule.RuleDto;
@@ -73,7 +74,7 @@ public class RuleOperationsTest {
     when(dbClient.openSession(false)).thenReturn(session);
     when(dbClient.ruleDao()).thenReturn(ruleDao);
     when(dbClient.debtCharacteristicDao()).thenReturn(characteristicDao);
-    operations = new RuleOperations(dbClient);
+    operations = new RuleOperations(dbClient, System2.INSTANCE);
   }
 
   @Test