@@ -47,7 +47,7 @@ import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT | |||
import static org.sonar.ce.task.projectanalysis.component.Component.Type.SUBVIEW; | |||
import static org.sonar.ce.task.projectanalysis.component.Component.Type.VIEW; | |||
import static org.sonar.db.component.ComponentTesting.newPrivateProjectDto; | |||
import static org.sonar.db.component.ComponentTesting.newSubView; | |||
import static org.sonar.db.component.ComponentTesting.newSubPortfolio; | |||
import static org.sonar.db.component.ComponentTesting.newPortfolio; | |||
public class ViewsPersistAnalysisStepTest extends BaseStepTest { | |||
@@ -93,7 +93,7 @@ public class ViewsPersistAnalysisStepTest extends BaseStepTest { | |||
@Test | |||
public void persist_analysis() { | |||
ComponentDto viewDto = save(ComponentTesting.newPortfolio("UUID_VIEW").setDbKey("KEY_VIEW")); | |||
save(newSubView(viewDto, "UUID_SUBVIEW", "KEY_SUBVIEW")); | |||
save(ComponentTesting.newSubPortfolio(viewDto, "UUID_SUBVIEW", "KEY_SUBVIEW")); | |||
save(newPrivateProjectDto("proj")); | |||
dbTester.getSession().commit(); | |||
@@ -119,7 +119,7 @@ public class ViewsPersistAnalysisStepTest extends BaseStepTest { | |||
@Test | |||
public void persist_snapshots_with_new_code_period() { | |||
ComponentDto viewDto = save(ComponentTesting.newPortfolio("UUID_VIEW").setDbKey("KEY_VIEW")); | |||
ComponentDto subViewDto = save(newSubView(viewDto, "UUID_SUBVIEW", "KEY_SUBVIEW")); | |||
ComponentDto subViewDto = save(ComponentTesting.newSubPortfolio(viewDto, "UUID_SUBVIEW", "KEY_SUBVIEW")); | |||
dbTester.getSession().commit(); | |||
Component subView = ViewsComponent.builder(SUBVIEW, "KEY_SUBVIEW").setUuid("UUID_SUBVIEW").build(); |
@@ -58,7 +58,7 @@ import static org.sonar.ce.task.projectanalysis.component.ViewAttributes.Type.PO | |||
import static org.sonar.ce.task.projectanalysis.component.ViewsComponent.builder; | |||
import static org.sonar.db.component.ComponentTesting.newPrivateProjectDto; | |||
import static org.sonar.db.component.ComponentTesting.newProjectCopy; | |||
import static org.sonar.db.component.ComponentTesting.newSubView; | |||
import static org.sonar.db.component.ComponentTesting.newSubPortfolio; | |||
public class ViewsPersistComponentsStepTest extends BaseStepTest { | |||
@@ -214,7 +214,7 @@ public class ViewsPersistComponentsStepTest extends BaseStepTest { | |||
public void persist_existing_empty_subview_under_existing_view() { | |||
ComponentDto viewDto = newViewDto(); | |||
persistComponents(viewDto); | |||
persistComponents(ComponentTesting.newSubView(viewDto, SUBVIEW_1_UUID, SUBVIEW_1_KEY).setName(SUBVIEW_1_NAME)); | |||
persistComponents(ComponentTesting.newSubPortfolio(viewDto, SUBVIEW_1_UUID, SUBVIEW_1_KEY).setName(SUBVIEW_1_NAME)); | |||
treeRootHolder.setRoot( | |||
createViewBuilder(PORTFOLIO) | |||
@@ -418,7 +418,7 @@ public class ViewsPersistComponentsStepTest extends BaseStepTest { | |||
ComponentDto project = dbTester.components().insertComponent(ComponentTesting.newPrivateProjectDto()); | |||
ComponentDto view = newViewDto().setUuid(VIEW_UUID).setDbKey(VIEW_KEY).setName("View").setPrivate(isRootPrivate); | |||
dbTester.components().insertComponent(view); | |||
ComponentDto subView = newSubView(view).setUuid("BCDE").setDbKey("MODULE").setPrivate(!isRootPrivate); | |||
ComponentDto subView = newSubPortfolio(view).setUuid("BCDE").setDbKey("MODULE").setPrivate(!isRootPrivate); | |||
dbTester.components().insertComponent(subView); | |||
dbTester.components().insertComponent(newProjectCopy("DEFG", project, view).setDbKey("DIR").setPrivate(isRootPrivate)); | |||
treeRootHolder.setRoot( | |||
@@ -485,7 +485,7 @@ public class ViewsPersistComponentsStepTest extends BaseStepTest { | |||
} | |||
private ComponentDto newSubViewDto(ComponentDto rootView) { | |||
return ComponentTesting.newSubView(rootView, SUBVIEW_1_UUID, SUBVIEW_1_KEY) | |||
return ComponentTesting.newSubPortfolio(rootView, SUBVIEW_1_UUID, SUBVIEW_1_KEY) | |||
.setName(SUBVIEW_1_NAME); | |||
} | |||
@@ -154,7 +154,7 @@ public class ReportAnalysisFailureNotificationExecutionListenerTest { | |||
ComponentDto directory = dbTester.components().insertComponent(newDirectory(module, randomAlphanumeric(12))); | |||
ComponentDto file = dbTester.components().insertComponent(ComponentTesting.newFileDto(project)); | |||
ComponentDto view = dbTester.components().insertComponent(ComponentTesting.newPortfolio()); | |||
ComponentDto subView = dbTester.components().insertComponent(ComponentTesting.newSubView(view)); | |||
ComponentDto subView = dbTester.components().insertComponent(ComponentTesting.newSubPortfolio(view)); | |||
ComponentDto projectCopy = dbTester.components().insertComponent(ComponentTesting.newProjectCopy(project, subView)); | |||
ComponentDto application = dbTester.components().insertComponent(ComponentTesting.newApplication()); | |||
@@ -708,7 +708,7 @@ public class CeQueueDaoTest { | |||
view.setRootUuid(view_uuid); | |||
view.setUuidPath("uuid_path"); | |||
view.setProjectUuid(view_uuid); | |||
db.components().insertViewAndSnapshot(view); | |||
db.components().insertPortfolioAndSnapshot(view); | |||
db.commit(); | |||
} | |||
@@ -77,7 +77,7 @@ import static org.sonar.db.component.ComponentTesting.newFileDto; | |||
import static org.sonar.db.component.ComponentTesting.newModuleDto; | |||
import static org.sonar.db.component.ComponentTesting.newPrivateProjectDto; | |||
import static org.sonar.db.component.ComponentTesting.newProjectCopy; | |||
import static org.sonar.db.component.ComponentTesting.newSubView; | |||
import static org.sonar.db.component.ComponentTesting.newSubPortfolio; | |||
import static org.sonar.db.component.ComponentTesting.newPortfolio; | |||
import static org.sonar.db.component.ComponentTreeQuery.Strategy.CHILDREN; | |||
import static org.sonar.db.component.ComponentTreeQuery.Strategy.LEAVES; | |||
@@ -1756,9 +1756,9 @@ public class ComponentDaoTest { | |||
@Test | |||
public void select_descendants_of_a_view_and_filter_by_name() { | |||
ComponentDto view = ComponentTesting.newPortfolio(A_VIEW_UUID); | |||
db.components().insertViewAndSnapshot(view); | |||
db.components().insertPortfolioAndSnapshot(view); | |||
// one subview | |||
ComponentDto subView = newSubView(view, "subview-uuid", "subview-key").setName("subview name"); | |||
ComponentDto subView = ComponentTesting.newSubPortfolio(view, "subview-uuid", "subview-key").setName("subview name"); | |||
db.components().insertComponent(subView); | |||
// one project and its copy linked to the view | |||
ComponentDto project = newPrivateProjectDto(PROJECT_UUID).setName("project name"); | |||
@@ -1844,7 +1844,7 @@ public class ComponentDaoTest { | |||
ComponentDto projectDto = db.components().insertComponent(newPrivateProjectDto()); | |||
ComponentDto view = db.components().insertComponent(newPortfolio()); | |||
ComponentDto subview = db.components().insertComponent(newSubView(view)); | |||
ComponentDto subview = db.components().insertComponent(newSubPortfolio(view)); | |||
ComponentDto app = db.components().insertComponent(newApplication()); | |||
@@ -103,7 +103,7 @@ import static org.sonar.db.component.ComponentTesting.newDirectory; | |||
import static org.sonar.db.component.ComponentTesting.newFileDto; | |||
import static org.sonar.db.component.ComponentTesting.newModuleDto; | |||
import static org.sonar.db.component.ComponentTesting.newProjectCopy; | |||
import static org.sonar.db.component.ComponentTesting.newSubView; | |||
import static org.sonar.db.component.ComponentTesting.newSubPortfolio; | |||
import static org.sonar.db.component.SnapshotDto.STATUS_PROCESSED; | |||
import static org.sonar.db.component.SnapshotDto.STATUS_UNPROCESSED; | |||
import static org.sonar.db.component.SnapshotTesting.newSnapshot; | |||
@@ -1095,10 +1095,10 @@ public class PurgeDaoTest { | |||
public void delete_view_and_child() { | |||
ComponentDto project = db.components().insertPrivateProject(); | |||
ComponentDto view = db.components().insertPrivatePortfolio(); | |||
ComponentDto subView = db.components().insertComponent(newSubView(view)); | |||
ComponentDto subView = db.components().insertComponent(newSubPortfolio(view)); | |||
ComponentDto projectCopy = db.components().insertComponent(newProjectCopy(project, subView)); | |||
ComponentDto otherView = db.components().insertPrivatePortfolio(); | |||
ComponentDto otherSubView = db.components().insertComponent(newSubView(otherView)); | |||
ComponentDto otherSubView = db.components().insertComponent(newSubPortfolio(otherView)); | |||
ComponentDto otherProjectCopy = db.components().insertComponent(newProjectCopy(project, otherSubView)); | |||
underTest.deleteProject(dbSession, view.uuid(), view.qualifier()); | |||
@@ -1466,8 +1466,8 @@ public class PurgeDaoTest { | |||
}; | |||
ComponentDto view = db.components().insertPrivatePortfolio(); | |||
ComponentDto subview1 = db.components().insertComponent(newSubView(view)); | |||
ComponentDto subview2 = db.components().insertComponent(newSubView(subview1)); | |||
ComponentDto subview1 = db.components().insertComponent(newSubPortfolio(view)); | |||
ComponentDto subview2 = db.components().insertComponent(newSubPortfolio(subview1)); | |||
List<ComponentDto> components = asList( | |||
view, | |||
subview1, | |||
@@ -1512,8 +1512,8 @@ public class PurgeDaoTest { | |||
}; | |||
ComponentDto view = db.components().insertPrivatePortfolio(); | |||
ComponentDto subview1 = db.components().insertComponent(newSubView(view)); | |||
ComponentDto subview2 = db.components().insertComponent(newSubView(subview1)); | |||
ComponentDto subview1 = db.components().insertComponent(newSubPortfolio(view)); | |||
ComponentDto subview2 = db.components().insertComponent(newSubPortfolio(subview1)); | |||
ComponentDto pc1 = db.components().insertComponent(newProjectCopy("a", projects[0], view)); | |||
ComponentDto pc2 = db.components().insertComponent(newProjectCopy("b", projects[1], subview1)); | |||
ComponentDto pc3 = db.components().insertComponent(newProjectCopy("c", projects[2], subview2)); | |||
@@ -1532,7 +1532,7 @@ public class PurgeDaoTest { | |||
@Test | |||
public void deleteNonRootComponents_deletes_measures_of_any_non_root_component_of_a_view() { | |||
ComponentDto view = db.components().insertPrivatePortfolio(); | |||
ComponentDto subview = db.components().insertComponent(newSubView(view)); | |||
ComponentDto subview = db.components().insertComponent(newSubPortfolio(view)); | |||
ComponentDto pc = db.components().insertComponent(newProjectCopy("a", db.components().insertPrivateProject(), view)); | |||
insertMeasureFor(view, subview, pc); | |||
assertThat(getComponentUuidsOfMeasures()).containsOnly(view.uuid(), subview.uuid(), pc.uuid()); | |||
@@ -1549,9 +1549,9 @@ public class PurgeDaoTest { | |||
@Test | |||
public void deleteNonRootComponents_deletes_properties_of_subviews_of_a_view() { | |||
ComponentDto view = db.components().insertPrivatePortfolio(); | |||
ComponentDto subview1 = db.components().insertComponent(newSubView(view)); | |||
ComponentDto subview2 = db.components().insertComponent(newSubView(subview1)); | |||
ComponentDto subview3 = db.components().insertComponent(newSubView(view)); | |||
ComponentDto subview1 = db.components().insertComponent(newSubPortfolio(view)); | |||
ComponentDto subview2 = db.components().insertComponent(newSubPortfolio(subview1)); | |||
ComponentDto subview3 = db.components().insertComponent(newSubPortfolio(view)); | |||
ComponentDto pc = db.components().insertComponent(newProjectCopy("a", db.components().insertPrivateProject(), view)); | |||
insertPropertyFor(view, subview1, subview2, subview3, pc); | |||
assertThat(getResourceIdOfProperties()).containsOnly(view.uuid(), subview1.uuid(), subview2.uuid(), subview3.uuid(), pc.uuid()); |
@@ -100,9 +100,9 @@ public class PurgeMapperTest { | |||
@Test | |||
public void selectRootAndModulesOrSubviewsByProjectUuid_returns_subviews_with_specified_project_uuid_and_view() { | |||
ComponentDto view = db.components().insertPublicPortfolio(); | |||
ComponentDto subview1 = db.components().insertComponent(ComponentTesting.newSubView(view)); | |||
ComponentDto subview2 = db.components().insertComponent(ComponentTesting.newSubView(view)); | |||
ComponentDto subview3 = db.components().insertComponent(ComponentTesting.newSubView(view)); | |||
ComponentDto subview1 = db.components().insertComponent(ComponentTesting.newSubPortfolio(view)); | |||
ComponentDto subview2 = db.components().insertComponent(ComponentTesting.newSubPortfolio(view)); | |||
ComponentDto subview3 = db.components().insertComponent(ComponentTesting.newSubPortfolio(view)); | |||
assertThat(purgeMapper.selectRootAndModulesOrSubviewsByProjectUuid(view.uuid())) | |||
.containsOnly(view.uuid(), subview1.uuid(), subview2.uuid(), subview3.uuid()); | |||
@@ -148,7 +148,7 @@ public class PurgeMapperTest { | |||
@Test | |||
public void selectRootAndModulesOrSubviewsByProjectUuid_does_not_return_subview_with_specified_uuid() { | |||
ComponentDto view = db.components().insertPrivatePortfolio(); | |||
ComponentDto subview = db.components().insertComponent(ComponentTesting.newSubView(view)); | |||
ComponentDto subview = db.components().insertComponent(ComponentTesting.newSubPortfolio(view)); | |||
assertThat(purgeMapper.selectRootAndModulesOrSubviewsByProjectUuid(subview.uuid())) | |||
.isEmpty(); |
@@ -50,7 +50,7 @@ public class ComponentDbTester { | |||
return insertSnapshot(component); | |||
} | |||
public SnapshotDto insertViewAndSnapshot(ComponentDto component) { | |||
public SnapshotDto insertPortfolioAndSnapshot(ComponentDto component) { | |||
dbClient.componentDao().insert(dbSession, component); | |||
return insertSnapshot(component); | |||
} | |||
@@ -225,7 +225,7 @@ public class ComponentDbTester { | |||
} | |||
public final ComponentDto insertSubView(ComponentDto view, Consumer<ComponentDto> dtoPopulator) { | |||
return insertComponentAndBranchAndProject(ComponentTesting.newSubView(view), view.isPrivate(), defaults(), dtoPopulator); | |||
return insertComponentAndBranchAndProject(ComponentTesting.newSubPortfolio(view), view.isPrivate(), defaults(), dtoPopulator); | |||
} | |||
private ComponentDto insertComponentAndBranchAndProject(ComponentDto component, @Nullable Boolean isPrivate, Consumer<BranchDto> branchPopulator, |
@@ -76,8 +76,8 @@ public class ComponentTesting { | |||
.setQualifier(Qualifiers.DIRECTORY); | |||
} | |||
public static ComponentDto newSubView(ComponentDto viewOrSubView, String uuid, String key) { | |||
return newModuleDto(uuid, viewOrSubView) | |||
public static ComponentDto newSubPortfolio(ComponentDto portfolioOrSubPortfolio, String uuid, String key) { | |||
return newModuleDto(uuid, portfolioOrSubPortfolio) | |||
.setDbKey(key) | |||
.setName(key) | |||
.setLongName(key) | |||
@@ -86,9 +86,9 @@ public class ComponentTesting { | |||
.setPath(null); | |||
} | |||
public static ComponentDto newSubView(ComponentDto viewOrSubView) { | |||
public static ComponentDto newSubPortfolio(ComponentDto viewOrSubView) { | |||
String uuid = Uuids.createFast(); | |||
return newSubView(viewOrSubView, uuid, "KEY_" + uuid); | |||
return newSubPortfolio(viewOrSubView, uuid, "KEY_" + uuid); | |||
} | |||
public static ComponentDto newModuleDto(String uuid, ComponentDto parentModuleOrProject) { |
@@ -41,7 +41,7 @@ import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.assertj.core.api.Assertions.tuple; | |||
import static org.sonar.api.resources.Qualifiers.APP; | |||
import static org.sonar.db.component.ComponentTesting.newProjectCopy; | |||
import static org.sonar.db.component.ComponentTesting.newSubView; | |||
import static org.sonar.db.component.ComponentTesting.newSubPortfolio; | |||
import static org.sonar.server.view.index.ViewIndexDefinition.TYPE_VIEW; | |||
public class ViewIndexerTest { | |||
@@ -76,7 +76,7 @@ public class ViewIndexerTest { | |||
ComponentDto view2 = db.components().insertPrivatePortfolio(); | |||
db.components().insertSnapshot(view2, t -> t.setLast(true)); | |||
db.components().insertComponent(newProjectCopy(project2, view2)); | |||
ComponentDto subView = db.components().insertComponent(newSubView(view2)); | |||
ComponentDto subView = db.components().insertComponent(newSubPortfolio(view2)); | |||
db.components().insertComponent(newProjectCopy(project3, subView)); | |||
// view without project | |||
ComponentDto view3 = db.components().insertPrivatePortfolio(); | |||
@@ -108,7 +108,7 @@ public class ViewIndexerTest { | |||
ComponentDto view2 = db.components().insertPrivatePortfolio(); | |||
db.components().insertSnapshot(view2, t -> t.setLast(true)); | |||
db.components().insertComponent(newProjectCopy(project2, view2)); | |||
ComponentDto subView = db.components().insertComponent(newSubView(view2)); | |||
ComponentDto subView = db.components().insertComponent(newSubPortfolio(view2)); | |||
db.components().insertComponent(newProjectCopy(project3, subView)); | |||
// view without project | |||
ComponentDto view3 = db.components().insertPrivatePortfolio(); |
@@ -55,7 +55,7 @@ import static org.sonar.db.component.ComponentTesting.newDirectory; | |||
import static org.sonar.db.component.ComponentTesting.newFileDto; | |||
import static org.sonar.db.component.ComponentTesting.newModuleDto; | |||
import static org.sonar.db.component.ComponentTesting.newProjectCopy; | |||
import static org.sonar.db.component.ComponentTesting.newSubView; | |||
import static org.sonar.db.component.ComponentTesting.newSubPortfolio; | |||
import static org.sonar.db.rule.RuleTesting.newRule; | |||
public class IssueQueryFactoryTest { | |||
@@ -331,7 +331,7 @@ public class IssueQueryFactoryTest { | |||
@Test | |||
public void return_empty_results_if_not_allowed_to_search_for_subview() { | |||
ComponentDto view = db.components().insertPrivatePortfolio(); | |||
ComponentDto subView = db.components().insertComponent(newSubView(view)); | |||
ComponentDto subView = db.components().insertComponent(newSubPortfolio(view)); | |||
SearchRequest request = new SearchRequest() | |||
.setComponentUuids(singletonList(subView.uuid())); | |||
@@ -554,7 +554,7 @@ public class SuggestionsActionTest { | |||
ComponentDto app = db.components().insertPublicApplication(v -> v.setName(query)); | |||
ComponentDto view = db.components().insertPublicPortfolio(v -> v.setName(query)); | |||
ComponentDto subView = db.components().insertComponent(ComponentTesting.newSubView(view).setName(query)); | |||
ComponentDto subView = db.components().insertComponent(ComponentTesting.newSubPortfolio(view).setName(query)); | |||
ComponentDto project = db.components().insertPrivateProject(p -> p.setName(query)); | |||
ComponentDto module = db.components().insertComponent(ComponentTesting.newModuleDto(project).setName(query)); | |||
ComponentDto file = db.components().insertComponent(ComponentTesting.newFileDto(module).setName(query)); |
@@ -68,7 +68,7 @@ import static org.sonar.db.component.ComponentTesting.newDirectory; | |||
import static org.sonar.db.component.ComponentTesting.newModuleDto; | |||
import static org.sonar.db.component.ComponentTesting.newPrivateProjectDto; | |||
import static org.sonar.db.component.ComponentTesting.newProjectCopy; | |||
import static org.sonar.db.component.ComponentTesting.newSubView; | |||
import static org.sonar.db.component.ComponentTesting.newSubPortfolio; | |||
import static org.sonar.db.component.ComponentTesting.newPortfolio; | |||
import static org.sonarqube.ws.client.component.ComponentsWsParameters.PARAM_BRANCH; | |||
import static org.sonarqube.ws.client.component.ComponentsWsParameters.PARAM_COMPONENT; | |||
@@ -254,11 +254,11 @@ public class TreeActionTest { | |||
@Test | |||
public void project_reference_from_portfolio() { | |||
ComponentDto view = ComponentTesting.newPortfolio("view-uuid"); | |||
db.components().insertViewAndSnapshot(view); | |||
db.components().insertPortfolioAndSnapshot(view); | |||
ComponentDto project = newPrivateProjectDto("project-uuid-1").setName("project-name").setDbKey("project-key-1"); | |||
db.components().insertProjectAndSnapshot(project); | |||
db.components().insertComponent(newProjectCopy("project-uuid-1-copy", project, view)); | |||
db.components().insertComponent(newSubView(view, "sub-view-uuid", "sub-view-key").setName("sub-view-name")); | |||
db.components().insertComponent(ComponentTesting.newSubPortfolio(view, "sub-view-uuid", "sub-view-key").setName("sub-view-name")); | |||
db.commit(); | |||
userSession.logIn() | |||
.registerComponents(view, project); | |||
@@ -316,7 +316,7 @@ public class TreeActionTest { | |||
ComponentDto project = newPrivateProjectDto("project-uuid"); | |||
db.components().insertProjectAndSnapshot(project); | |||
ComponentDto view = ComponentTesting.newPortfolio("view-uuid"); | |||
db.components().insertViewAndSnapshot(view); | |||
db.components().insertPortfolioAndSnapshot(view); | |||
ComponentDto projectCopy = db.components().insertComponent(newProjectCopy("project-copy-uuid", project, view)); | |||
userSession.logIn() | |||
.registerComponents(project, view); |
@@ -72,7 +72,7 @@ import static org.sonar.db.component.ComponentTesting.newDirectory; | |||
import static org.sonar.db.component.ComponentTesting.newFileDto; | |||
import static org.sonar.db.component.ComponentTesting.newModuleDto; | |||
import static org.sonar.db.component.ComponentTesting.newProjectCopy; | |||
import static org.sonar.db.component.ComponentTesting.newSubView; | |||
import static org.sonar.db.component.ComponentTesting.newSubPortfolio; | |||
import static org.sonar.db.component.ComponentTesting.newPortfolio; | |||
import static org.sonarqube.ws.client.component.ComponentsWsParameters.PARAM_BRANCH; | |||
import static org.sonarqube.ws.client.issue.IssuesWsParameters.PARAM_COMPONENT_KEYS; | |||
@@ -390,7 +390,7 @@ public class SearchActionComponentsTest { | |||
RuleDefinitionDto rule = db.rules().insertIssueRule(r -> r.setRuleKey(RuleKey.of("xoo", "x1"))); | |||
db.issues().insertIssue(rule, project, file, i -> i.setKee("82fd47d4-b650-4037-80bc-7b112bd4eac2")); | |||
ComponentDto view = db.components().insertComponent(ComponentTesting.newPortfolio("V1").setDbKey("MyView")); | |||
ComponentDto subView = db.components().insertComponent(newSubView(view, "SV1", "MySubView")); | |||
ComponentDto subView = db.components().insertComponent(ComponentTesting.newSubPortfolio(view, "SV1", "MySubView")); | |||
db.components().insertComponent(newProjectCopy(project, subView)); | |||
allowAnyoneOnProjects(project, view, subView); | |||
indexIssuesAndViews(); | |||
@@ -408,7 +408,7 @@ public class SearchActionComponentsTest { | |||
RuleDefinitionDto rule = db.rules().insertIssueRule(r -> r.setRuleKey(RuleKey.of("xoo", "x1"))); | |||
db.issues().insertIssue(rule, project, file, i -> i.setKee("82fd47d4-b650-4037-80bc-7b112bd4eac2")); | |||
ComponentDto view = db.components().insertComponent(ComponentTesting.newPortfolio("V1").setDbKey("MyView")); | |||
ComponentDto subView = db.components().insertComponent(newSubView(view, "SV1", "MySubView")); | |||
ComponentDto subView = db.components().insertComponent(ComponentTesting.newSubPortfolio(view, "SV1", "MySubView")); | |||
db.components().insertComponent(newProjectCopy(project, subView)); | |||
// User has no permission on the view, no issue will be returned | |||
allowAnyoneOnProjects(project); |
@@ -73,7 +73,7 @@ import static org.sonar.db.component.BranchType.PULL_REQUEST; | |||
import static org.sonar.db.component.ComponentTesting.newDirectory; | |||
import static org.sonar.db.component.ComponentTesting.newFileDto; | |||
import static org.sonar.db.component.ComponentTesting.newProjectCopy; | |||
import static org.sonar.db.component.ComponentTesting.newSubView; | |||
import static org.sonar.db.component.ComponentTesting.newSubPortfolio; | |||
import static org.sonar.db.component.ComponentTesting.newPortfolio; | |||
import static org.sonar.db.component.SnapshotTesting.newAnalysis; | |||
import static org.sonar.server.component.ws.MeasuresWsParameters.ADDITIONAL_PERIOD; | |||
@@ -664,7 +664,7 @@ public class ComponentTreeActionTest { | |||
ComponentDto view = db.components().insertComponent(ComponentTesting.newPortfolio("VIEW1-UUID").setDbKey("Apache-Projects").setName("Apache Projects")); | |||
ComponentDto view2 = db.components().insertPrivatePortfolio(); | |||
ComponentDto localView = db.components().insertComponent( | |||
newSubView(view, "SUB-VIEW-UUID", "All-Projects").setName("All projects").setCopyComponentUuid(view2.uuid())); | |||
ComponentTesting.newSubPortfolio(view, "SUB-VIEW-UUID", "All-Projects").setName("All projects").setCopyComponentUuid(view2.uuid())); | |||
db.components().insertSnapshot(view); | |||
MetricDto ncloc = insertNclocMetric(); | |||
db.measures().insertLiveMeasure(localView, ncloc, m -> m.setValue(5d)); | |||
@@ -684,7 +684,7 @@ public class ComponentTreeActionTest { | |||
ComponentDto view = db.components().insertComponent(ComponentTesting.newPortfolio("VIEW1-UUID").setDbKey("Apache-Projects").setName("Apache Projects")); | |||
ComponentDto application = db.components().insertPrivateApplication(); | |||
ComponentDto localView = db.components().insertComponent( | |||
newSubView(view, "SUB-VIEW-UUID", "All-Projects").setName("All projects").setCopyComponentUuid(application.uuid())); | |||
ComponentTesting.newSubPortfolio(view, "SUB-VIEW-UUID", "All-Projects").setName("All projects").setCopyComponentUuid(application.uuid())); | |||
db.components().insertSnapshot(view); | |||
MetricDto ncloc = insertNclocMetric(); | |||
db.measures().insertLiveMeasure(localView, ncloc, m -> m.setValue(5d)); |
@@ -53,7 +53,7 @@ import static org.sonar.api.measures.Metric.ValueType.INT; | |||
import static org.sonar.db.component.ComponentTesting.newDirectory; | |||
import static org.sonar.db.component.ComponentTesting.newFileDto; | |||
import static org.sonar.db.component.ComponentTesting.newModuleDto; | |||
import static org.sonar.db.component.ComponentTesting.newSubView; | |||
import static org.sonar.db.component.ComponentTesting.newSubPortfolio; | |||
import static org.sonar.server.component.ws.MeasuresWsParameters.PARAM_METRIC_KEYS; | |||
import static org.sonar.server.component.ws.MeasuresWsParameters.PARAM_PROJECT_KEYS; | |||
import static org.sonar.test.JsonAssert.assertJson; | |||
@@ -225,7 +225,7 @@ public class SearchActionTest { | |||
@Test | |||
public void return_measures_on_sub_view() { | |||
ComponentDto view = db.components().insertPrivatePortfolio(); | |||
ComponentDto subView = db.components().insertComponent(newSubView(view)); | |||
ComponentDto subView = db.components().insertComponent(newSubPortfolio(view)); | |||
userSession.addProjectPermission(UserRole.USER, subView); | |||
MetricDto metric = db.measures().insertMetric(m -> m.setValueType(FLOAT.name())); | |||
db.measures().insertLiveMeasure(subView, metric, m -> m.setValue(15.5d)); |
@@ -306,7 +306,7 @@ public class AddActionTest { | |||
public void fail_when_component_is_not_a_project() { | |||
UserDto user = db.users().insertUser(); | |||
userSession.logIn(user); | |||
db.components().insertViewAndSnapshot(newPortfolio().setDbKey("VIEW_1")); | |||
db.components().insertPortfolioAndSnapshot(newPortfolio().setDbKey("VIEW_1")); | |||
when(dispatchers.getGlobalDispatchers()).thenReturn(singletonList(NOTIF_MY_NEW_ISSUES)); | |||
when(dispatchers.getProjectDispatchers()).thenReturn(singletonList(NOTIF_MY_NEW_ISSUES)); | |||
@@ -284,7 +284,7 @@ public class RemoveActionTest { | |||
userSession.logIn(user); | |||
when(dispatchers.getGlobalDispatchers()).thenReturn(singletonList(NOTIF_MY_NEW_ISSUES)); | |||
when(dispatchers.getProjectDispatchers()).thenReturn(singletonList(NOTIF_MY_NEW_ISSUES)); | |||
db.components().insertViewAndSnapshot(newPortfolio().setDbKey("VIEW_1")); | |||
db.components().insertPortfolioAndSnapshot(newPortfolio().setDbKey("VIEW_1")); | |||
RemoveRequest request = this.request.setProject("VIEW_1"); | |||
assertThatThrownBy(() -> call(request)) |
@@ -48,7 +48,7 @@ import static org.sonar.db.component.ComponentTesting.newDirectory; | |||
import static org.sonar.db.component.ComponentTesting.newFileDto; | |||
import static org.sonar.db.component.ComponentTesting.newModuleDto; | |||
import static org.sonar.db.component.ComponentTesting.newPrivateProjectDto; | |||
import static org.sonar.db.component.ComponentTesting.newSubView; | |||
import static org.sonar.db.component.ComponentTesting.newSubPortfolio; | |||
import static org.sonar.db.permission.GlobalPermission.ADMINISTER; | |||
import static org.sonar.db.permission.GlobalPermission.PROVISION_PROJECTS; | |||
import static org.sonar.db.permission.GlobalPermission.SCAN; | |||
@@ -210,7 +210,7 @@ public class AddGroupActionTest extends BasePermissionWsTest<AddGroupAction> { | |||
@Test | |||
public void fail_when_component_is_a_subview() { | |||
ComponentDto project = db.components().insertPrivateProject(); | |||
ComponentDto file = db.components().insertComponent(newSubView(project)); | |||
ComponentDto file = db.components().insertComponent(newSubPortfolio(project)); | |||
failIfComponentIsNotAProjectOrView(file); | |||
} |
@@ -46,7 +46,7 @@ import static org.sonar.core.permission.GlobalPermissions.SYSTEM_ADMIN; | |||
import static org.sonar.db.component.ComponentTesting.newDirectory; | |||
import static org.sonar.db.component.ComponentTesting.newFileDto; | |||
import static org.sonar.db.component.ComponentTesting.newModuleDto; | |||
import static org.sonar.db.component.ComponentTesting.newSubView; | |||
import static org.sonar.db.component.ComponentTesting.newSubPortfolio; | |||
import static org.sonar.db.component.ComponentTesting.newPortfolio; | |||
import static org.sonar.db.permission.GlobalPermission.ADMINISTER; | |||
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PERMISSION; | |||
@@ -169,7 +169,7 @@ public class AddUserActionTest extends BasePermissionWsTest<AddUserAction> { | |||
@Test | |||
public void fail_when_component_is_a_subview() { | |||
ComponentDto project = db.components().insertPrivateProject(); | |||
ComponentDto file = db.components().insertComponent(newSubView(project)); | |||
ComponentDto file = db.components().insertComponent(newSubPortfolio(project)); | |||
failIfComponentIsNotAProjectOrView(file); | |||
} |
@@ -49,7 +49,7 @@ import static org.sonar.core.permission.GlobalPermissions.SYSTEM_ADMIN; | |||
import static org.sonar.db.component.ComponentTesting.newDirectory; | |||
import static org.sonar.db.component.ComponentTesting.newFileDto; | |||
import static org.sonar.db.component.ComponentTesting.newModuleDto; | |||
import static org.sonar.db.component.ComponentTesting.newSubView; | |||
import static org.sonar.db.component.ComponentTesting.newSubPortfolio; | |||
import static org.sonar.db.permission.GlobalPermission.ADMINISTER; | |||
import static org.sonar.db.permission.GlobalPermission.PROVISION_PROJECTS; | |||
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_GROUP_ID; | |||
@@ -231,7 +231,7 @@ public class RemoveGroupActionTest extends BasePermissionWsTest<RemoveGroupActio | |||
@Test | |||
public void fail_when_component_is_a_subview() { | |||
ComponentDto project = db.components().insertPrivateProject(); | |||
ComponentDto file = db.components().insertComponent(newSubView(project)); | |||
ComponentDto file = db.components().insertComponent(newSubPortfolio(project)); | |||
failIfComponentIsNotAProjectOrView(file); | |||
} |
@@ -48,7 +48,7 @@ import static org.sonar.core.permission.GlobalPermissions.SYSTEM_ADMIN; | |||
import static org.sonar.db.component.ComponentTesting.newDirectory; | |||
import static org.sonar.db.component.ComponentTesting.newFileDto; | |||
import static org.sonar.db.component.ComponentTesting.newModuleDto; | |||
import static org.sonar.db.component.ComponentTesting.newSubView; | |||
import static org.sonar.db.component.ComponentTesting.newSubPortfolio; | |||
import static org.sonar.db.permission.GlobalPermission.ADMINISTER; | |||
import static org.sonar.db.permission.GlobalPermission.ADMINISTER_QUALITY_GATES; | |||
import static org.sonar.db.permission.GlobalPermission.PROVISION_PROJECTS; | |||
@@ -239,7 +239,7 @@ public class RemoveUserActionTest extends BasePermissionWsTest<RemoveUserAction> | |||
@Test | |||
public void fail_when_component_is_a_subview() { | |||
ComponentDto portfolio = db.components().insertPrivatePortfolio(); | |||
ComponentDto file = db.components().insertComponent(newSubView(portfolio)); | |||
ComponentDto file = db.components().insertComponent(newSubPortfolio(portfolio)); | |||
failIfComponentIsNotAProjectOrView(file); | |||
} |
@@ -195,7 +195,7 @@ public class UpdateVisibilityActionTest { | |||
dbTester.components().insertComponents(module, dir, file); | |||
ComponentDto application = dbTester.components().insertPublicApplication(); | |||
ComponentDto portfolio = dbTester.components().insertPrivatePortfolio(); | |||
ComponentDto subView = ComponentTesting.newSubView(portfolio); | |||
ComponentDto subView = ComponentTesting.newSubPortfolio(portfolio); | |||
ComponentDto projectCopy = newProjectCopy("foo", project, subView); | |||
dbTester.components().insertComponents(subView, projectCopy); | |||
userSessionRule.addProjectPermission(UserRole.ADMIN, project, portfolio, application); |
@@ -349,7 +349,7 @@ public class ResetActionTest { | |||
@Test | |||
public void succeed_for_property_without_definition_when_set_on_subview_component() { | |||
ComponentDto view = db.components().insertPublicPortfolio(); | |||
ComponentDto subview = db.components().insertComponent(ComponentTesting.newSubView(view)); | |||
ComponentDto subview = db.components().insertComponent(ComponentTesting.newSubPortfolio(view)); | |||
succeedForPropertyWithoutDefinitionAndValidComponent(view, subview); | |||
} | |||
@@ -779,7 +779,7 @@ public class SetActionTest { | |||
@Test | |||
public void succeed_for_property_without_definition_when_set_on_subview_component() { | |||
ComponentDto view = db.components().insertPrivatePortfolio(); | |||
ComponentDto subview = db.components().insertComponent(ComponentTesting.newSubView(view)); | |||
ComponentDto subview = db.components().insertComponent(ComponentTesting.newSubPortfolio(view)); | |||
succeedForPropertyWithoutDefinitionAndValidComponent(view, subview); | |||
} | |||