From 50324c4ab7e55dfd8293dd9ac21afe751ac7e345 Mon Sep 17 00:00:00 2001 From: =?utf8?q?L=C3=A9o=20Geoffroy?= Date: Thu, 22 Jun 2023 17:50:35 +0200 Subject: [PATCH] SONAR-19558 Fix duplication indexes tests to support --- .../step/LoadCrossProjectDuplicationsRepositoryStepIT.java | 6 ++---- .../it/java/org/sonar/db/duplication/DuplicationDaoIT.java | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStepIT.java index 613c40d17e3..e1a812d52e9 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStepIT.java @@ -101,8 +101,7 @@ public class LoadCrossProjectDuplicationsRepositoryStepIT { @Before public void setUp() { - ComponentDto project = ComponentTesting.newPrivateProjectDto(); - dbTester.components().insertComponent(project); + ComponentDto project = dbTester.components().insertPrivateProject().getMainBranchComponent(); SnapshotDto projectSnapshot = SnapshotTesting.newAnalysis(project); dbClient.snapshotDao().insert(dbSession, projectSnapshot); dbSession.commit(); @@ -315,8 +314,7 @@ public class LoadCrossProjectDuplicationsRepositoryStepIT { } private ComponentDto createProject(String projectKey) { - ComponentDto project = ComponentTesting.newPrivateProjectDto().setKey(projectKey); - return dbTester.components().insertComponent(project); + return dbTester.components().insertPrivateProject(p->p.setKey(projectKey)).getMainBranchComponent(); } private SnapshotDto createProjectSnapshot(ComponentDto project) { diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/duplication/DuplicationDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/duplication/DuplicationDaoIT.java index f69c74cbbd8..b5d89740698 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/duplication/DuplicationDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/duplication/DuplicationDaoIT.java @@ -42,7 +42,7 @@ import static org.sonar.db.component.ComponentTesting.newPrivateProjectDto; public class DuplicationDaoIT { @Rule - public DbTester db = DbTester.create(System2.INSTANCE); + public DbTester db = DbTester.create(System2.INSTANCE, true); private final DbSession dbSession = db.getSession(); private final DuplicationDao dao = db.getDbClient().duplicationDao(); -- 2.39.5