SONAR-18679 refactored sonar-db-core and sonar-db-dao to match testing strategy

122 files changed, 16 insertions, 8 deletions

diff --git a/server/sonar-db-dao/build.gradle b/server/sonar-db-dao/build.gradle
index f4210fdc6d3..27d7e36d4b1 100644
--- a/server/sonar-db-dao/build.gradle
+++ b/server/sonar-db-dao/build.gradle
@@ -4,6 +4,16 @@ sonar {
   }
 }
 
+sourceSets {
+    test {
+        resources {
+            srcDirs += ['src/it/resources']
+        }
+        java{
+            srcDirs += ['src/it/java']
+        }
+    }
+}
 dependencies {
   // please keep the list grouped by configuration and ordered by name
 
@@ -53,6 +63,7 @@ task dumpSchema(type:JavaExec) {
     mainClass = 'org.sonar.db.dump.DumpSQSchema'
     classpath = sourceSets.test.runtimeClasspath
 }
+
 tasks.check.dependsOn dumpSchema
 
 task createDB(type:JavaExec) {
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/DatabaseMBeanTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/DatabaseMBeanTest.java
index 7e57f166439..7e57f166439 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/DatabaseMBeanTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/DatabaseMBeanTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/IsAliveMapperTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/IsAliveMapperTest.java
index a517c824c95..5e3682b0d66 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/IsAliveMapperTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/IsAliveMapperTest.java
@@ -31,8 +31,8 @@ public class IsAliveMapperTest {
   @Rule
   public DbTester dbTester = DbTester.create(System2.INSTANCE);
 
-  DbSession session;
-  IsAliveMapper underTest;
+  private DbSession session;
+  private IsAliveMapper underTest;
 
   @Before
   public void setUp() {
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/MyBatisTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/MyBatisTest.java
index 6fe2424487e..6fe2424487e 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/MyBatisTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/MyBatisTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/SQDatabaseForH2Test.java b/server/sonar-db-dao/src/it/java/org/sonar/db/SQDatabaseForH2Test.java
index 4d6afc68081..4d6afc68081 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/SQDatabaseForH2Test.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/SQDatabaseForH2Test.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/alm/pat/AlmPatDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/alm/pat/AlmPatDaoTest.java
index bc50b315daf..bc50b315daf 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/alm/pat/AlmPatDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/alm/pat/AlmPatDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/alm/pat/AlmPatDaoWithPersisterTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/alm/pat/AlmPatDaoWithPersisterTest.java
index 4c1c7812721..4c1c7812721 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/alm/pat/AlmPatDaoWithPersisterTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/alm/pat/AlmPatDaoWithPersisterTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/alm/setting/AlmSettingDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/AlmSettingDaoTest.java
index de17cf16b3f..de17cf16b3f 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/alm/setting/AlmSettingDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/AlmSettingDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/alm/setting/AlmSettingDaoWithPersisterTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/AlmSettingDaoWithPersisterTest.java
index 12bd69ae0ae..12bd69ae0ae 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/alm/setting/AlmSettingDaoWithPersisterTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/AlmSettingDaoWithPersisterTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/alm/setting/ProjectAlmSettingDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/ProjectAlmSettingDaoTest.java
index be764013dab..be764013dab 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/alm/setting/ProjectAlmSettingDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/ProjectAlmSettingDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/alm/setting/ProjectAlmSettingDaoWithPersisterTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/ProjectAlmSettingDaoWithPersisterTest.java
index 131bfbd8ee6..163c3a3c821 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/alm/setting/ProjectAlmSettingDaoWithPersisterTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/alm/setting/ProjectAlmSettingDaoWithPersisterTest.java
@@ -43,7 +43,6 @@ import static org.sonar.db.almsettings.AlmSettingsTesting.newGithubProjectAlmSet
 public class ProjectAlmSettingDaoWithPersisterTest {
   private static final long A_DATE = 1_000_000_000_000L;
   private static final long A_DATE_LATER = 1_700_000_000_000L;
-  private static final String A_UUID = "SOME_UUID";
 
   private final ArgumentCaptor<DevOpsPlatformSettingNewValue> newValueCaptor = ArgumentCaptor.forClass(DevOpsPlatformSettingNewValue.class);
   private final AuditPersister auditPersister = mock(AuditPersister.class);
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/audit/AuditDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/audit/AuditDaoTest.java
index 64f9de0d3a2..64f9de0d3a2 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/audit/AuditDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/audit/AuditDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/ce/CeActivityDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeActivityDaoTest.java
index f920bdc5548..f920bdc5548 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/ce/CeActivityDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeActivityDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/ce/CeQueueDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeQueueDaoTest.java
index 9c762256ec0..9c762256ec0 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/ce/CeQueueDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeQueueDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/ce/CeScannerContextDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeScannerContextDaoTest.java
index bbd2a0ab564..bbd2a0ab564 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/ce/CeScannerContextDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeScannerContextDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/ce/CeTaskCharacteristicDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeTaskCharacteristicDaoTest.java
index 40f37b9f42e..40f37b9f42e 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/ce/CeTaskCharacteristicDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeTaskCharacteristicDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/ce/CeTaskInputDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeTaskInputDaoTest.java
index ff74997ef14..ff74997ef14 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/ce/CeTaskInputDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeTaskInputDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/ce/CeTaskMessageDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeTaskMessageDaoTest.java
index 8ae72104f1b..8ae72104f1b 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/ce/CeTaskMessageDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeTaskMessageDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/component/AnalysisPropertiesDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/component/AnalysisPropertiesDaoTest.java
index 1b4b6384d76..1b4b6384d76 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/component/AnalysisPropertiesDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/component/AnalysisPropertiesDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/component/ApplicationProjectsDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/component/ApplicationProjectsDaoTest.java
index fcd3877b6e3..fcd3877b6e3 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/component/ApplicationProjectsDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/component/ApplicationProjectsDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/component/BranchDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/component/BranchDaoTest.java
index 3156edc6e91..3156edc6e91 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/component/BranchDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/component/BranchDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/component/ComponentDaoTest.java
index de315a06e37..de315a06e37 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/component/ComponentDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentKeyUpdaterDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/component/ComponentKeyUpdaterDaoTest.java
index 5e2282d61ec..5e2282d61ec 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentKeyUpdaterDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/component/ComponentKeyUpdaterDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/component/ProjectLinkDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/component/ProjectLinkDaoTest.java
index edcf436aa74..edcf436aa74 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/component/ProjectLinkDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/component/ProjectLinkDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/component/ScrollForFileMoveComponentDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/component/ScrollForFileMoveComponentDaoTest.java
index 3f99ac188aa..3f99ac188aa 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/component/ScrollForFileMoveComponentDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/component/ScrollForFileMoveComponentDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/component/SnapshotDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/component/SnapshotDaoTest.java
index 04b691f84d2..04b691f84d2 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/component/SnapshotDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/component/SnapshotDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/duplication/DuplicationDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/duplication/DuplicationDaoTest.java
index 0102e902bcf..3d9b6f1c6b3 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/duplication/DuplicationDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/duplication/DuplicationDaoTest.java
@@ -35,7 +35,6 @@ import org.sonar.db.component.ComponentDto;
 import org.sonar.db.component.ComponentTesting;
 import org.sonar.db.component.SnapshotDto;
 
-import static com.google.common.collect.ImmutableList.of;
 import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.tuple;
 import static org.sonar.db.component.ComponentTesting.newPrivateProjectDto;
@@ -78,7 +77,7 @@ public class DuplicationDaoTest {
       assertThat(dao.selectCandidates(dbSession, newAnalysis.getUuid(), "donut", singletonList(hash)))
         .isEmpty();
     }
-    for (List<String> hashes : Arrays.asList(of("aa", "bb"), of("bb", "aa"), of("aa", "bb", "cc"))) {
+    for (List<String> hashes : Arrays.asList(List.of("aa", "bb"), List.of("bb", "aa"), List.of("aa", "bb", "cc"))) {
       assertThat(dao.selectCandidates(dbSession, newAnalysis.getUuid(), "foo", hashes))
         .containsOnly(
           tuple(fooFile.uuid(), fooFile.getKey(), lastAnalysis.getUuid(), "aa"),
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/es/EsQueueDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/es/EsQueueDaoTest.java
index e86fe635cad..e86fe635cad 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/es/EsQueueDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/es/EsQueueDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/event/EventComponentChangeDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/event/EventComponentChangeDaoTest.java
index 97a521409b5..97a521409b5 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/event/EventComponentChangeDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/event/EventComponentChangeDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/event/EventDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/event/EventDaoTest.java
index 6c41d79d051..bd7c9d11b93 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/event/EventDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/event/EventDaoTest.java
@@ -34,7 +34,6 @@ import org.sonar.db.component.ComponentTesting;
 import org.sonar.db.component.SnapshotDto;
 
 import static com.google.common.collect.Lists.newArrayList;
-import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.sonar.db.component.SnapshotTesting.newAnalysis;
 import static org.sonar.db.event.EventTesting.newEvent;
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/issue/IssueChangeDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueChangeDaoTest.java
index c6c44f4a11e..c6c44f4a11e 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/issue/IssueChangeDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueChangeDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/issue/IssueChangeMapperTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueChangeMapperTest.java
index ea3950ff0de..ea3950ff0de 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/issue/IssueChangeMapperTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueChangeMapperTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/issue/IssueDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueDaoTest.java
index c39707eefb2..c39707eefb2 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/issue/IssueDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/issue/IssueMapperTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueMapperTest.java
index a510974eb30..a510974eb30 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/issue/IssueMapperTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueMapperTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/mapping/ProjectMappingsDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/mapping/ProjectMappingsDaoTest.java
index dfb0e1a1408..dfb0e1a1408 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/mapping/ProjectMappingsDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/mapping/ProjectMappingsDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/measure/LiveMeasureDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/measure/LiveMeasureDaoTest.java
index 89e34ffd984..89e34ffd984 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/measure/LiveMeasureDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/measure/LiveMeasureDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/measure/MeasureDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/measure/MeasureDaoTest.java
index 735a87dd092..735a87dd092 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/measure/MeasureDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/measure/MeasureDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/measure/MeasureTreeQueryTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/measure/MeasureTreeQueryTest.java
index 966f190cc9c..966f190cc9c 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/measure/MeasureTreeQueryTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/measure/MeasureTreeQueryTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/measure/ProjectMeasuresIndexerIteratorTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/measure/ProjectMeasuresIndexerIteratorTest.java
index 460046ae197..460046ae197 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/measure/ProjectMeasuresIndexerIteratorTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/measure/ProjectMeasuresIndexerIteratorTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/metric/MetricDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/metric/MetricDaoTest.java
index b8da7e7bc35..b8da7e7bc35 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/metric/MetricDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/metric/MetricDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/newcodeperiod/NewCodePeriodDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/newcodeperiod/NewCodePeriodDaoTest.java
index 34ba49f71fa..34ba49f71fa 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/newcodeperiod/NewCodePeriodDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/newcodeperiod/NewCodePeriodDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/notification/NotificationQueueDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/notification/NotificationQueueDaoTest.java
index 6e4100d9c32..6e4100d9c32 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/notification/NotificationQueueDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/notification/NotificationQueueDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/AuthorizationDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/AuthorizationDaoTest.java
index 8e48101304e..8e48101304e 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/AuthorizationDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/AuthorizationDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/GroupPermissionDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/GroupPermissionDaoTest.java
index 00841b794f2..00841b794f2 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/GroupPermissionDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/GroupPermissionDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/GroupPermissionDaoWithPersisterTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/GroupPermissionDaoWithPersisterTest.java
index a275d977fd7..a275d977fd7 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/GroupPermissionDaoWithPersisterTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/GroupPermissionDaoWithPersisterTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/UserPermissionDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/UserPermissionDaoTest.java
index 8b5214bb9d7..8b5214bb9d7 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/UserPermissionDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/UserPermissionDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/UserPermissionDaoWithPersisterTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/UserPermissionDaoWithPersisterTest.java
index fd836f3e8a5..fd836f3e8a5 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/UserPermissionDaoWithPersisterTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/UserPermissionDaoWithPersisterTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/GroupWithPermissionTemplateDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/GroupWithPermissionTemplateDaoTest.java
index 0dfdd76264a..0dfdd76264a 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/GroupWithPermissionTemplateDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/GroupWithPermissionTemplateDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/PermissionTemplateCharacteristicDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/PermissionTemplateCharacteristicDaoTest.java
index 0eac924423b..0eac924423b 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/PermissionTemplateCharacteristicDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/PermissionTemplateCharacteristicDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/PermissionTemplateCharacteristicDaoWithPersisterTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/PermissionTemplateCharacteristicDaoWithPersisterTest.java
index c01083ed34f..c01083ed34f 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/PermissionTemplateCharacteristicDaoWithPersisterTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/PermissionTemplateCharacteristicDaoWithPersisterTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/PermissionTemplateDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/PermissionTemplateDaoTest.java
index c863316939e..c863316939e 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/PermissionTemplateDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/PermissionTemplateDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/PermissionTemplateDaoWithPersisterTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/PermissionTemplateDaoWithPersisterTest.java
index ee7e61f7f10..ee7e61f7f10 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/PermissionTemplateDaoWithPersisterTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/PermissionTemplateDaoWithPersisterTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/UserWithPermissionTemplateDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/UserWithPermissionTemplateDaoTest.java
index 639cc9f1c4f..639cc9f1c4f 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/UserWithPermissionTemplateDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/permission/template/UserWithPermissionTemplateDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/plugin/PluginDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/plugin/PluginDaoTest.java
index d9e9f53616d..d9e9f53616d 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/plugin/PluginDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/plugin/PluginDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/plugin/PluginDaoWithPersisterTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/plugin/PluginDaoWithPersisterTest.java
index e5251b464a7..e5251b464a7 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/plugin/PluginDaoWithPersisterTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/plugin/PluginDaoWithPersisterTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/portfolio/PortfolioDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/portfolio/PortfolioDaoTest.java
index e8494423f86..e8494423f86 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/portfolio/PortfolioDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/portfolio/PortfolioDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/project/ProjectBadgeTokenDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/project/ProjectBadgeTokenDaoTest.java
index cc6665d7683..cc6665d7683 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/project/ProjectBadgeTokenDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/project/ProjectBadgeTokenDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/project/ProjectDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/project/ProjectDaoTest.java
index 51476f1449f..51476f1449f 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/project/ProjectDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/project/ProjectDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/property/InternalComponentPropertiesDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/property/InternalComponentPropertiesDaoTest.java
index 5b538b68809..5b538b68809 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/property/InternalComponentPropertiesDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/property/InternalComponentPropertiesDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/property/InternalPropertiesDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/property/InternalPropertiesDaoTest.java
index b325573604d..b325573604d 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/property/InternalPropertiesDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/property/InternalPropertiesDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/property/PropertiesDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/property/PropertiesDaoTest.java
index a6af409a481..a6af409a481 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/property/PropertiesDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/property/PropertiesDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/property/PropertiesDaoWithPersisterTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/property/PropertiesDaoWithPersisterTest.java
index 333a15229a1..333a15229a1 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/property/PropertiesDaoWithPersisterTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/property/PropertiesDaoWithPersisterTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/property/PropertiesRow.java b/server/sonar-db-dao/src/it/java/org/sonar/db/property/PropertiesRow.java
index 373a13532e4..373a13532e4 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/property/PropertiesRow.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/property/PropertiesRow.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/property/PropertiesRowAssert.java b/server/sonar-db-dao/src/it/java/org/sonar/db/property/PropertiesRowAssert.java
index 37ae854e9cc..37ae854e9cc 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/property/PropertiesRowAssert.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/property/PropertiesRowAssert.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/purge/PurgeCommandsTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeCommandsTest.java
index a44fabfd009..a44fabfd009 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/purge/PurgeCommandsTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeCommandsTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/purge/PurgeDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeDaoTest.java
index f9c3fc6cc32..f9c3fc6cc32 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/purge/PurgeDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/purge/PurgeDaoWithAuditTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeDaoWithAuditTest.java
index d984a71d611..d984a71d611 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/purge/PurgeDaoWithAuditTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeDaoWithAuditTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/purge/PurgeMapperTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeMapperTest.java
index 5a0d001d588..5a0d001d588 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/purge/PurgeMapperTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeMapperTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/pushevent/PushEventDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/pushevent/PushEventDaoTest.java
index 54df172590e..54df172590e 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/pushevent/PushEventDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/pushevent/PushEventDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/qualitygate/ProjectQgateAssociationDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/ProjectQgateAssociationDaoTest.java
index d03b6c59e3a..d03b6c59e3a 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/qualitygate/ProjectQgateAssociationDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/ProjectQgateAssociationDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/qualitygate/QualityGateConditionDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/QualityGateConditionDaoTest.java
index 24e7104aea6..24e7104aea6 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/qualitygate/QualityGateConditionDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/QualityGateConditionDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/qualitygate/QualityGateDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/QualityGateDaoTest.java
index 73f0b6db08d..73f0b6db08d 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/qualitygate/QualityGateDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/QualityGateDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/qualitygate/QualityGateGroupPermissionsDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/QualityGateGroupPermissionsDaoTest.java
index 0e00895f97e..0e00895f97e 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/qualitygate/QualityGateGroupPermissionsDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/QualityGateGroupPermissionsDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/qualitygate/QualityGateUserPermissionsDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/QualityGateUserPermissionsDaoTest.java
index ee22bd271f1..ee22bd271f1 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/qualitygate/QualityGateUserPermissionsDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/qualitygate/QualityGateUserPermissionsDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/ActiveRuleDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/ActiveRuleDaoTest.java
index 3d908f56522..3d908f56522 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/ActiveRuleDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/ActiveRuleDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/DefaultQProfileDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/DefaultQProfileDaoTest.java
index 6be546eae50..6be546eae50 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/DefaultQProfileDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/DefaultQProfileDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/QProfileChangeDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QProfileChangeDaoTest.java
index e9429e9413b..e9429e9413b 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/QProfileChangeDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QProfileChangeDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/QProfileEditGroupsDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QProfileEditGroupsDaoTest.java
index 887c0b2fdf6..887c0b2fdf6 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/QProfileEditGroupsDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QProfileEditGroupsDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/QProfileEditUsersDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QProfileEditUsersDaoTest.java
index 615bc184d90..615bc184d90 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/QProfileEditUsersDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QProfileEditUsersDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/QualityProfileDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QualityProfileDaoTest.java
index fe56c743a37..fe56c743a37 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/QualityProfileDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QualityProfileDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/QualityProfileExportDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QualityProfileExportDaoTest.java
index fa3ffb89e8d..fa3ffb89e8d 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/QualityProfileExportDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/qualityprofile/QualityProfileExportDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/report/RegulatoryReportDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/report/RegulatoryReportDaoTest.java
index 25c23e412ec..25c23e412ec 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/report/RegulatoryReportDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/report/RegulatoryReportDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/rule/RuleDaoTest.java
index 202f2b9d348..202f2b9d348 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/rule/RuleDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleRepositoryDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/rule/RuleRepositoryDaoTest.java
index 015d10b65da..015d10b65da 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleRepositoryDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/rule/RuleRepositoryDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/scannercache/ScannerAnalysisCacheDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/scannercache/ScannerAnalysisCacheDaoTest.java
index a7f9ac456ac..a7f9ac456ac 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/scannercache/ScannerAnalysisCacheDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/scannercache/ScannerAnalysisCacheDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/schemamigration/SchemaMigrationDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/schemamigration/SchemaMigrationDaoTest.java
index 79ebb810180..79ebb810180 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/schemamigration/SchemaMigrationDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/schemamigration/SchemaMigrationDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/scim/ScimUserDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/scim/ScimUserDaoTest.java
index ba7983ef674..ba7983ef674 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/scim/ScimUserDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/scim/ScimUserDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/source/FileSourceDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/source/FileSourceDaoTest.java
index 01398aec0c3..01398aec0c3 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/source/FileSourceDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/source/FileSourceDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/user/GroupDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/user/GroupDaoTest.java
index c525d956212..c525d956212 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/user/GroupDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/user/GroupDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/user/GroupDaoWithPersisterTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/user/GroupDaoWithPersisterTest.java
index b2f57626db6..b2f57626db6 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/user/GroupDaoWithPersisterTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/user/GroupDaoWithPersisterTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/user/GroupMembershipDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/user/GroupMembershipDaoTest.java
index 556375cae11..556375cae11 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/user/GroupMembershipDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/user/GroupMembershipDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/user/RoleDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/user/RoleDaoTest.java
index 76380f5a695..76380f5a695 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/user/RoleDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/user/RoleDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/user/SamlMessageIdDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/user/SamlMessageIdDaoTest.java
index 3f8b4306760..3f8b4306760 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/user/SamlMessageIdDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/user/SamlMessageIdDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/user/SessionTokensDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/user/SessionTokensDaoTest.java
index 2bd9058e6a3..2bd9058e6a3 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/user/SessionTokensDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/user/SessionTokensDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserDaoTest.java
index 42b4c5d494c..42b4c5d494c 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserDaoWithPersisterTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserDaoWithPersisterTest.java
index ad2465979bf..ad2465979bf 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserDaoWithPersisterTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserDaoWithPersisterTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserDismissedMessagesDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserDismissedMessagesDaoTest.java
index 4ecac45783c..4ecac45783c 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserDismissedMessagesDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserDismissedMessagesDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserGroupDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserGroupDaoTest.java
index c954b23d96c..c954b23d96c 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserGroupDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserGroupDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserGroupDaoWithPersisterTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserGroupDaoWithPersisterTest.java
index 37090565f33..37090565f33 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserGroupDaoWithPersisterTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserGroupDaoWithPersisterTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserTokenDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserTokenDaoTest.java
index 01e1dc6485a..01e1dc6485a 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserTokenDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserTokenDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserTokenDaoWithPersisterTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserTokenDaoWithPersisterTest.java
index aa14810271b..aa14810271b 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserTokenDaoWithPersisterTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserTokenDaoWithPersisterTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/webhook/WebhookDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/webhook/WebhookDaoTest.java
index be18630eba8..be18630eba8 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/webhook/WebhookDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/webhook/WebhookDaoTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/webhook/WebhookDaoWithPersisterTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/webhook/WebhookDaoWithPersisterTest.java
index f47cbb305b4..f47cbb305b4 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/webhook/WebhookDaoWithPersisterTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/webhook/WebhookDaoWithPersisterTest.java
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/webhook/WebhookDeliveryDaoTest.java b/server/sonar-db-dao/src/it/java/org/sonar/db/webhook/WebhookDeliveryDaoTest.java
index 6f6f0f9b772..6f6f0f9b772 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/webhook/WebhookDeliveryDaoTest.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/webhook/WebhookDeliveryDaoTest.java
diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/core/qualitymodel/DefaultModelFinderTest/shared.xml b/server/sonar-db-dao/src/it/resources/org/sonar/core/qualitymodel/DefaultModelFinderTest/shared.xml
index 6e9cab1c815..6e9cab1c815 100644
--- a/server/sonar-db-dao/src/test/resources/org/sonar/core/qualitymodel/DefaultModelFinderTest/shared.xml
+++ b/server/sonar-db-dao/src/it/resources/org/sonar/core/qualitymodel/DefaultModelFinderTest/shared.xml
diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ResourceDaoTest/update_authorization_date-result.xml b/server/sonar-db-dao/src/it/resources/org/sonar/db/component/ResourceDaoTest/update_authorization_date-result.xml
index 637ab8ecaf9..637ab8ecaf9 100644
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ResourceDaoTest/update_authorization_date-result.xml
+++ b/server/sonar-db-dao/src/it/resources/org/sonar/db/component/ResourceDaoTest/update_authorization_date-result.xml
diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ResourceDaoTest/update_authorization_date.xml b/server/sonar-db-dao/src/it/resources/org/sonar/db/component/ResourceDaoTest/update_authorization_date.xml
index 637ab8ecaf9..637ab8ecaf9 100644
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/component/ResourceDaoTest/update_authorization_date.xml
+++ b/server/sonar-db-dao/src/it/resources/org/sonar/db/component/ResourceDaoTest/update_authorization_date.xml
diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/issue/IssueDaoTest/shared.xml b/server/sonar-db-dao/src/it/resources/org/sonar/db/issue/IssueDaoTest/shared.xml
index 583ec53880b..583ec53880b 100644
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/issue/IssueDaoTest/shared.xml
+++ b/server/sonar-db-dao/src/it/resources/org/sonar/db/issue/IssueDaoTest/shared.xml
diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_issue_and_component_ids.xml b/server/sonar-db-dao/src/it/resources/org/sonar/db/issue/IssueDaoTest/should_select_issue_and_component_ids.xml
index a86bf7a776a..a86bf7a776a 100644
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_issue_and_component_ids.xml
+++ b/server/sonar-db-dao/src/it/resources/org/sonar/db/issue/IssueDaoTest/should_select_issue_and_component_ids.xml
diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module.xml b/server/sonar-db-dao/src/it/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module.xml
index 946a67dd5be..946a67dd5be 100644
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module.xml
+++ b/server/sonar-db-dao/src/it/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module.xml
diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module_on_removed_project.xml b/server/sonar-db-dao/src/it/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module_on_removed_project.xml
index 8993c05ac53..8993c05ac53 100644
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module_on_removed_project.xml
+++ b/server/sonar-db-dao/src/it/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module_on_removed_project.xml
diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/issue/IssueStatsDaoTest/should_select_assignees.xml b/server/sonar-db-dao/src/it/resources/org/sonar/db/issue/IssueStatsDaoTest/should_select_assignees.xml
index 8b14a83d2a9..8b14a83d2a9 100644
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/issue/IssueStatsDaoTest/should_select_assignees.xml
+++ b/server/sonar-db-dao/src/it/resources/org/sonar/db/issue/IssueStatsDaoTest/should_select_assignees.xml
diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/measure/MeasureDaoTest/empty.xml b/server/sonar-db-dao/src/it/resources/org/sonar/db/measure/MeasureDaoTest/empty.xml
index dda18829567..dda18829567 100644
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/measure/MeasureDaoTest/empty.xml
+++ b/server/sonar-db-dao/src/it/resources/org/sonar/db/measure/MeasureDaoTest/empty.xml
diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/measure/MeasureDaoTest/insert-result.xml b/server/sonar-db-dao/src/it/resources/org/sonar/db/measure/MeasureDaoTest/insert-result.xml
index 2af5e30c370..2af5e30c370 100644
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/measure/MeasureDaoTest/insert-result.xml
+++ b/server/sonar-db-dao/src/it/resources/org/sonar/db/measure/MeasureDaoTest/insert-result.xml
diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/measure/MeasureDaoTest/past_measures.xml b/server/sonar-db-dao/src/it/resources/org/sonar/db/measure/MeasureDaoTest/past_measures.xml
index 35a3f8823da..35a3f8823da 100644
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/measure/MeasureDaoTest/past_measures.xml
+++ b/server/sonar-db-dao/src/it/resources/org/sonar/db/measure/MeasureDaoTest/past_measures.xml
diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/measure/MeasureDaoTest/select_by_snapshot_and_metric_keys.xml b/server/sonar-db-dao/src/it/resources/org/sonar/db/measure/MeasureDaoTest/select_by_snapshot_and_metric_keys.xml
index 81544d11094..81544d11094 100644
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/measure/MeasureDaoTest/select_by_snapshot_and_metric_keys.xml
+++ b/server/sonar-db-dao/src/it/resources/org/sonar/db/measure/MeasureDaoTest/select_by_snapshot_and_metric_keys.xml
diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/measure/MeasureDaoTest/shared.xml b/server/sonar-db-dao/src/it/resources/org/sonar/db/measure/MeasureDaoTest/shared.xml
index 2255cf96ee2..2255cf96ee2 100644
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/measure/MeasureDaoTest/shared.xml
+++ b/server/sonar-db-dao/src/it/resources/org/sonar/db/measure/MeasureDaoTest/shared.xml
diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/AuthorizationDaoTest/should_return_root_project_keys_for_anonymous.xml b/server/sonar-db-dao/src/it/resources/org/sonar/db/permission/AuthorizationDaoTest/should_return_root_project_keys_for_anonymous.xml
index 64b5561d605..64b5561d605 100644
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/AuthorizationDaoTest/should_return_root_project_keys_for_anonymous.xml
+++ b/server/sonar-db-dao/src/it/resources/org/sonar/db/permission/AuthorizationDaoTest/should_return_root_project_keys_for_anonymous.xml
diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/AuthorizationDaoTest/should_return_root_project_keys_for_group.xml b/server/sonar-db-dao/src/it/resources/org/sonar/db/permission/AuthorizationDaoTest/should_return_root_project_keys_for_group.xml
index 4a73fb1ea28..4a73fb1ea28 100644
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/AuthorizationDaoTest/should_return_root_project_keys_for_group.xml
+++ b/server/sonar-db-dao/src/it/resources/org/sonar/db/permission/AuthorizationDaoTest/should_return_root_project_keys_for_group.xml
diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/AuthorizationDaoTest/should_return_root_project_keys_for_user.xml b/server/sonar-db-dao/src/it/resources/org/sonar/db/permission/AuthorizationDaoTest/should_return_root_project_keys_for_user.xml
index 31404170f71..31404170f71 100644
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/AuthorizationDaoTest/should_return_root_project_keys_for_user.xml
+++ b/server/sonar-db-dao/src/it/resources/org/sonar/db/permission/AuthorizationDaoTest/should_return_root_project_keys_for_user.xml
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/PaginationTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/PaginationTest.java
index e59bc7f7c47..5f85d87c18b 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/PaginationTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/PaginationTest.java
@@ -25,6 +25,7 @@ import org.junit.Test;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.sonar.db.Pagination.forPage;
+
 public class PaginationTest {
 
   @Test
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/QProfileChangeDtoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/QProfileChangeDtoTest.java
index f0efd3bb21a..daf7368e68e 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/QProfileChangeDtoTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/QProfileChangeDtoTest.java
@@ -19,7 +19,6 @@
  */
 package org.sonar.db.qualityprofile;
 
-import com.google.common.collect.ImmutableMap;
 import java.util.Collections;
 import java.util.Map;
 import org.junit.Test;
@@ -39,7 +38,7 @@ public class QProfileChangeDtoTest {
     underTest.setData(Collections.emptyMap());
     assertThat(underTest.getDataAsMap()).isEmpty();
 
-    underTest.setData(ImmutableMap.of("k1", "v1", "k2", "v2"));
+    underTest.setData(Map.of("k1", "v1", "k2", "v2"));
     assertThat(underTest.getDataAsMap()).containsOnly(entry("k1", "v1"), entry("k2", "v2"));
   }
 }