From 67250227ba9801f7dd49fab1c89a6e22dfbbd9b4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Tue, 6 Mar 2018 15:32:30 +0100 Subject: [PATCH] SONAR-10261 remove Project#copyOf used only in UT --- .../task/projectanalysis/analysis/Project.java | 9 --------- .../task/projectanalysis/analysis/ProjectTest.java | 12 ------------ .../component/BranchPersisterImplTest.java | 2 +- .../component/ConfigurationRepositoryTest.java | 8 ++++---- .../step/PersistLiveMeasuresStepTest.java | 4 ++-- .../step/ReportPersistComponentsStepTest.java | 4 ++-- 6 files changed, 9 insertions(+), 30 deletions(-) diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/Project.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/Project.java index ff94c3dc7d6..3f048dda3bc 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/Project.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/Project.java @@ -20,8 +20,6 @@ package org.sonar.server.computation.task.projectanalysis.analysis; import javax.annotation.concurrent.Immutable; -import org.sonar.db.component.ComponentDto; -import org.sonar.server.computation.task.projectanalysis.component.Component; @Immutable public class Project { @@ -81,11 +79,4 @@ public class Project { return sb.toString(); } - public static Project copyOf(Component component) { - return new Project(component.getUuid(), component.getKey(), component.getName()); - } - - public static Project copyOf(ComponentDto component) { - return new Project(component.uuid(), component.getDbKey(), component.name()); - } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/ProjectTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/ProjectTest.java index 8a848329c3c..e034e1caf37 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/ProjectTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/ProjectTest.java @@ -20,11 +20,8 @@ package org.sonar.server.computation.task.projectanalysis.analysis; import org.junit.Test; -import org.sonar.server.computation.task.projectanalysis.component.Component; -import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; public class ProjectTest { @Test @@ -53,13 +50,4 @@ public class ProjectTest { assertThat(project1.hashCode()).isEqualTo(project1bis.hashCode()); } - @Test - public void test_copyOf() { - Component root = ReportComponent.builder(PROJECT, 1).setKey("ROOT").build(); - - Project project = Project.copyOf(root); - assertThat(project.getUuid()).isEqualTo(root.getUuid()).isNotNull(); - assertThat(project.getKey()).isEqualTo(root.getKey()).isNotNull(); - assertThat(project.getName()).isEqualTo(root.getName()).isNotNull(); - } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/BranchPersisterImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/BranchPersisterImplTest.java index d03da610b4b..ad333dd598d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/BranchPersisterImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/BranchPersisterImplTest.java @@ -71,7 +71,7 @@ public class BranchPersisterImplTest { // add main branch in project table and in metadata ComponentDto dto = ComponentTesting.newPrivateProjectDto(dbTester.organizations().insert(), MAIN.getUuid()).setDbKey(MAIN.getKey()); - analysisMetadataHolder.setProject(Project.copyOf(dto)); + analysisMetadataHolder.setProject(new Project(dto.uuid(), dto.getDbKey(), dto.name())); dbTester.getDbClient().componentDao().insert(dbTester.getSession(), dto); // this should add new columns in project and project_branches diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ConfigurationRepositoryTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ConfigurationRepositoryTest.java index ccc62246e6e..fbd6cf41791 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ConfigurationRepositoryTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ConfigurationRepositoryTest.java @@ -71,7 +71,7 @@ public class ConfigurationRepositoryTest { @Test public void get_project_settings_from_db() { ComponentDto project = db.components().insertPrivateProject(); - analysisMetadataHolder.setProject(Project.copyOf(project)); + analysisMetadataHolder.setProject(new Project(project.uuid(), project.getDbKey(), project.name())); insertProjectProperty(project, "key", "value"); Configuration config = underTest.getConfiguration(); @@ -96,7 +96,7 @@ public class ConfigurationRepositoryTest { globalSettings.setProperty("key", "value1"); ComponentDto project = db.components().insertPrivateProject(); insertProjectProperty(project, "key", "value2"); - analysisMetadataHolder.setProject(Project.copyOf(project)); + analysisMetadataHolder.setProject(new Project(project.uuid(), project.getDbKey(), project.name())); Configuration config = underTest.getConfiguration(); assertThat(config.get("key")).hasValue("value2"); @@ -106,7 +106,7 @@ public class ConfigurationRepositoryTest { public void project_settings_are_cached_to_avoid_db_access() { ComponentDto project = db.components().insertPrivateProject(); insertProjectProperty(project, "key", "value"); - analysisMetadataHolder.setProject(Project.copyOf(project)); + analysisMetadataHolder.setProject(new Project(project.uuid(), project.getDbKey(), project.name())); Configuration config = underTest.getConfiguration(); assertThat(config.get("key")).hasValue("value"); @@ -123,7 +123,7 @@ public class ConfigurationRepositoryTest { ComponentDto branchDto = db.components().insertProjectBranch(project); Branch branch = mock(Branch.class); when(branch.getName()).thenReturn(branchDto.getBranch()); - analysisMetadataHolder.setProject(Project.copyOf(project)).setBranch(branch); + analysisMetadataHolder.setProject(new Project(project.uuid(), project.getDbKey(), project.name())).setBranch(branch); globalSettings.setProperty("global", "global value"); insertProjectProperty(project, "project", "project value"); insertProjectProperty(branchDto, "branch", "branch value"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistLiveMeasuresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistLiveMeasuresStepTest.java index 7b5344daffe..7db1635a996 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistLiveMeasuresStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistLiveMeasuresStepTest.java @@ -234,7 +234,7 @@ public class PersistLiveMeasuresStepTest extends BaseStepTest { .build()) .build(); treeRootHolder.setRoot(project); - analysisMetadataHolder.setProject(Project.copyOf(project)); + analysisMetadataHolder.setProject(new Project(project.getUuid(), project.getKey(), project.getName())); // components as persisted in db ComponentDto projectDto = insertComponent("project-key", "project-uuid"); @@ -259,7 +259,7 @@ public class PersistLiveMeasuresStepTest extends BaseStepTest { ComponentDto portfolioDto = insertComponent("view-key", "view-uuid"); ComponentDto subViewDto = insertComponent("subview-key", "subview-uuid"); ComponentDto projectDto = insertComponent("project-key", "project-uuid"); - analysisMetadataHolder.setProject(Project.copyOf(portfolioDto)); + analysisMetadataHolder.setProject(new Project(portfolioDto.uuid(), portfolioDto.getDbKey(), portfolioDto.name())); } private void assertThatMeasureIsNotPersisted(String componentUuid, Metric metric) { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportPersistComponentsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportPersistComponentsStepTest.java index bec6d1b7ca6..5dddeaf6033 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportPersistComponentsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportPersistComponentsStepTest.java @@ -894,14 +894,14 @@ public class ReportPersistComponentsStepTest extends BaseStepTest { private ComponentDto prepareProject(Consumer... populators) { ComponentDto dto = db.components().insertPrivateProject(db.organizations().insert(), populators); - analysisMetadataHolder.setProject(Project.copyOf(dto)); + analysisMetadataHolder.setProject(new Project(dto.uuid(), dto.getDbKey(), dto.name())); analysisMetadataHolder.setBranch(new DefaultBranchImpl()); return dto; } private ComponentDto prepareBranch(String branchName, Consumer... populators) { ComponentDto dto = db.components().insertPrivateProject(db.organizations().insert(), populators); - analysisMetadataHolder.setProject(Project.copyOf(dto)); + analysisMetadataHolder.setProject(new Project(dto.uuid(), dto.getDbKey(), dto.name())); analysisMetadataHolder.setBranch(new TestBranch(branchName)); return dto; } -- 2.39.5