From 0b04dd7f05815bb20e830ecd2a6b3df3e391c330 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Fri, 6 Nov 2015 17:16:45 +0100 Subject: [PATCH] fix UT: remove duplicated tests since key is now stored in Component --- .../step/PersistDuplicationsStepTest.java | 207 ++++-------------- 1 file changed, 40 insertions(+), 167 deletions(-) diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationsStepTest.java index 37a0864c4f1..f5135948eb1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationsStepTest.java @@ -47,16 +47,17 @@ import static org.assertj.core.api.Assertions.assertThat; public class PersistDuplicationsStepTest extends BaseStepTest { private static final String PROJECT_KEY = "PROJECT_KEY"; + private static final int FILE_1_REF = 2; + private static final int FILE_2_REF = 3; + private static final int ROOT_REF = 1; + @Rule + public TreeRootHolderRule treeRootHolder = new TreeRootHolderRule(); @Rule public DbTester dbTester = DbTester.create(System2.INSTANCE); - @Rule public BatchReportReaderRule reportReader = new BatchReportReaderRule(); - @Rule - public TreeRootHolderRule treeRootHolder = new TreeRootHolderRule(); - DbIdsRepositoryImpl dbIdsRepository = new DbIdsRepositoryImpl(); DbSession session = dbTester.getSession(); @@ -94,22 +95,21 @@ public class PersistDuplicationsStepTest extends BaseStepTest { @Test public void persist_duplications_on_same_file() { MetricDto duplicationMetric = saveDuplicationMetric(); - initReportWithProjectAndFile(); BatchReport.Duplication duplication = BatchReport.Duplication.newBuilder() - .setOriginPosition(BatchReport.TextRange.newBuilder() - .setStartLine(1) - .setEndLine(5) - .build()) - .addDuplicate(BatchReport.Duplicate.newBuilder() - .setRange(BatchReport.TextRange.newBuilder() - .setStartLine(6) - .setEndLine(10) - .build()) - .build()) - .build(); - reportReader.putDuplications(2, newArrayList(duplication)); + .setOriginPosition(BatchReport.TextRange.newBuilder() + .setStartLine(1) + .setEndLine(5) + .build()) + .addDuplicate(BatchReport.Duplicate.newBuilder() + .setRange(BatchReport.TextRange.newBuilder() + .setStartLine(6) + .setEndLine(10) + .build()) + .build()) + .build(); + reportReader.putDuplications(FILE_1_REF, newArrayList(duplication)); underTest.execute(); @@ -121,154 +121,24 @@ public class PersistDuplicationsStepTest extends BaseStepTest { assertThat(dto.get("textValue")).isEqualTo(""); } - @Test - public void persist_duplications_on_same_file_linked_on_a_module() { - Component file = ReportComponent.builder(Component.Type.FILE, 3).setUuid("CDEF").setKey("MODULE_KEY:file").build(); - Component module = ReportComponent.builder(Component.Type.MODULE, 2).setUuid("BCDE").setKey("MODULE_KEY").addChildren(file).build(); - Component project = ReportComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").setKey(PROJECT_KEY).addChildren(module).build(); - treeRootHolder.setRoot(project); - - dbIdsRepository.setComponentId(project, 1); - dbIdsRepository.setSnapshotId(project, 10); - dbIdsRepository.setComponentId(module, 3); - dbIdsRepository.setSnapshotId(module, 11); - dbIdsRepository.setComponentId(file, 2); - dbIdsRepository.setSnapshotId(file, 12); - - saveDuplicationMetric(); - - BatchReport.Duplication duplication = BatchReport.Duplication.newBuilder() - .setOriginPosition(BatchReport.TextRange.newBuilder() - .setStartLine(1) - .setEndLine(5) - .build()) - .addDuplicate(BatchReport.Duplicate.newBuilder() - .setRange(BatchReport.TextRange.newBuilder() - .setStartLine(6) - .setEndLine(10) - .build()) - .build()) - .build(); - reportReader.putDuplications(3, newArrayList(duplication)); - - underTest.execute(); - - assertThat(dbTester.countRowsOfTable("project_measures")).isEqualTo(1); - - Map dto = dbTester.selectFirst("select snapshot_id as \"snapshotId\", text_value as \"textValue\" from project_measures"); - assertThat(dto.get("snapshotId")).isEqualTo(12L); - assertThat(dto.get("textValue")).isEqualTo(""); - } - - @Test - public void persist_duplications_on_same_file_linked_on_a_folder() { - Component file = ReportComponent.builder(Component.Type.FILE, 3).setUuid("CDEF").setKey("PROJECT_KEY:file").build(); - Component directory = ReportComponent.builder(Component.Type.DIRECTORY, 2).setUuid("BCDE").setKey("PROJECT_KEY:dir").addChildren(file).build(); - Component project = ReportComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").setKey(PROJECT_KEY).addChildren(directory).build(); - treeRootHolder.setRoot(project); - - dbIdsRepository.setComponentId(project, 1); - dbIdsRepository.setSnapshotId(project, 10); - dbIdsRepository.setComponentId(directory, 3); - dbIdsRepository.setSnapshotId(directory, 11); - dbIdsRepository.setComponentId(file, 2); - dbIdsRepository.setSnapshotId(file, 12); - - saveDuplicationMetric(); - - BatchReport.Duplication duplication = BatchReport.Duplication.newBuilder() - .setOriginPosition(BatchReport.TextRange.newBuilder() - .setStartLine(1) - .setEndLine(5) - .build()) - .addDuplicate(BatchReport.Duplicate.newBuilder() - .setRange(BatchReport.TextRange.newBuilder() - .setStartLine(6) - .setEndLine(10) - .build()) - .build()) - .build(); - reportReader.putDuplications(3, newArrayList(duplication)); - - underTest.execute(); - - assertThat(dbTester.countRowsOfTable("project_measures")).isEqualTo(1); - - Map dto = dbTester.selectFirst("select snapshot_id as \"snapshotId\", text_value as \"textValue\" from project_measures"); - assertThat(dto.get("snapshotId")).isEqualTo(12L); - assertThat(dto.get("textValue")).isEqualTo(""); - } - - @Test - public void persist_duplications_on_same_file_linked_on_sub_folder() { - Component file = ReportComponent.builder(Component.Type.FILE, 10).setUuid("DEFG").setKey("PROJECT_KEY:file").build(); - Component directory1 = ReportComponent.builder(Component.Type.DIRECTORY, 3).setUuid("CDEF").setKey("PROJECT_KEY:dir1").addChildren(file).build(); - Component directory2 = ReportComponent.builder(Component.Type.DIRECTORY, 2).setUuid("BCDE").setKey("PROJECT_KEY:dir2").addChildren(directory1).build(); - Component project = ReportComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").setKey(PROJECT_KEY).addChildren(directory2).build(); - treeRootHolder.setRoot(project); - - dbIdsRepository.setComponentId(project, 1); - dbIdsRepository.setSnapshotId(project, 10); - dbIdsRepository.setComponentId(directory1, 2); - dbIdsRepository.setSnapshotId(directory1, 11); - dbIdsRepository.setComponentId(directory2, 3); - dbIdsRepository.setSnapshotId(directory2, 12); - dbIdsRepository.setComponentId(file, 10); - dbIdsRepository.setSnapshotId(file, 20); - - saveDuplicationMetric(); - - BatchReport.Duplication duplication = BatchReport.Duplication.newBuilder() - .setOriginPosition(BatchReport.TextRange.newBuilder() - .setStartLine(1) - .setEndLine(5) - .build()) - .addDuplicate(BatchReport.Duplicate.newBuilder() - .setRange(BatchReport.TextRange.newBuilder() - .setStartLine(6) - .setEndLine(10) - .build()) - .build()) - .build(); - reportReader.putDuplications(10, newArrayList(duplication)); - - underTest.execute(); - - assertThat(dbTester.countRowsOfTable("project_measures")).isEqualTo(1); - - Map dto = dbTester.selectFirst("select snapshot_id as \"snapshotId\", text_value as \"textValue\" from project_measures"); - assertThat(dto.get("textValue")).isEqualTo(""); - } - @Test public void persist_duplications_on_different_files() { saveDuplicationMetric(); - - Component file2 = ReportComponent.builder(Component.Type.FILE, 3).setUuid("CDEF").setKey("PROJECT_KEY:file2").build(); - Component file = ReportComponent.builder(Component.Type.FILE, 2).setUuid("BCDE").setKey("PROJECT_KEY:file").build(); - Component project = ReportComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").setKey(PROJECT_KEY).addChildren(file, file2).build(); - treeRootHolder.setRoot(project); - - dbIdsRepository.setComponentId(project, 1); - dbIdsRepository.setSnapshotId(project, 10); - dbIdsRepository.setComponentId(file, 2); - dbIdsRepository.setSnapshotId(file, 11); - dbIdsRepository.setComponentId(file2, 2); - dbIdsRepository.setSnapshotId(file2, 12); + initReportWithProjectAndFile(); BatchReport.Duplication duplication = BatchReport.Duplication.newBuilder() - .setOriginPosition(BatchReport.TextRange.newBuilder() - .setStartLine(1) - .setEndLine(5) - .build()) - .addDuplicate(BatchReport.Duplicate.newBuilder() - .setOtherFileRef(3).setRange(BatchReport.TextRange.newBuilder() - .setStartLine(6) - .setEndLine(10) - .build()) - .build()) - .build(); - reportReader.putDuplications(2, newArrayList(duplication)); + .setOriginPosition(BatchReport.TextRange.newBuilder() + .setStartLine(1) + .setEndLine(5) + .build()) + .addDuplicate(BatchReport.Duplicate.newBuilder() + .setOtherFileRef(FILE_2_REF).setRange(BatchReport.TextRange.newBuilder() + .setStartLine(6) + .setEndLine(10) + .build()) + .build()) + .build(); + reportReader.putDuplications(FILE_1_REF, newArrayList(duplication)); underTest.execute(); @@ -280,21 +150,24 @@ public class PersistDuplicationsStepTest extends BaseStepTest { } private void initReportWithProjectAndFile() { - Component file = ReportComponent.builder(Component.Type.FILE, 2).setUuid("BCDE").setKey("PROJECT_KEY:file").build(); - Component project = ReportComponent.builder(Component.Type.PROJECT, 1).setUuid("ABCD").setKey(PROJECT_KEY).addChildren(file).build(); + Component file1 = ReportComponent.builder(Component.Type.FILE, FILE_1_REF).setUuid("BCDE").setKey("PROJECT_KEY:file").build(); + Component file2 = ReportComponent.builder(Component.Type.FILE, FILE_2_REF).setUuid("CDEF").setKey("PROJECT_KEY:file2").build(); + Component project = ReportComponent.builder(Component.Type.PROJECT, ROOT_REF).setUuid("ABCD").setKey(PROJECT_KEY).addChildren(file1, file2).build(); treeRootHolder.setRoot(project); dbIdsRepository.setComponentId(project, 1); dbIdsRepository.setSnapshotId(project, 10); - dbIdsRepository.setComponentId(file, 2); - dbIdsRepository.setSnapshotId(file, 11); + dbIdsRepository.setComponentId(file1, 2); + dbIdsRepository.setSnapshotId(file1, 11); + dbIdsRepository.setComponentId(file2, 2); + dbIdsRepository.setSnapshotId(file2, 12); } private MetricDto saveDuplicationMetric() { MetricDto duplicationMetric = new MetricDto().setKey(CoreMetrics.DUPLICATIONS_DATA_KEY) - .setOptimizedBestValue(false) - .setDeleteHistoricalData(false) - .setHidden(false); + .setOptimizedBestValue(false) + .setDeleteHistoricalData(false) + .setHidden(false); dbClient.metricDao().insert(session, duplicationMetric); session.commit(); return duplicationMetric; -- 2.39.5