diff options
author | Julien Lancelot <julien.lancelot@sonarsource.com> | 2017-04-28 11:39:40 +0200 |
---|---|---|
committer | Julien Lancelot <julien.lancelot@sonarsource.com> | 2017-04-28 18:36:09 +0200 |
commit | fdfa49be4133e34b6bb5849a137166eb29bf9109 (patch) | |
tree | 57c0ea40f099019e02e62b446f07a9f51142e845 /it | |
parent | e4390c1826c0e886be3bda201cac7f4401771778 (diff) | |
download | sonarqube-fdfa49be4133e34b6bb5849a137166eb29bf9109.tar.gz sonarqube-fdfa49be4133e34b6bb5849a137166eb29bf9109.zip |
Add visibility parameter in ProjectsService#create()
Diffstat (limited to 'it')
3 files changed, 4 insertions, 7 deletions
diff --git a/it/it-tests/src/test/java/it/administration/ProjectsAdministrationTest.java b/it/it-tests/src/test/java/it/administration/ProjectsAdministrationTest.java index 9efa0899ff5..c574563a4ae 100644 --- a/it/it-tests/src/test/java/it/administration/ProjectsAdministrationTest.java +++ b/it/it-tests/src/test/java/it/administration/ProjectsAdministrationTest.java @@ -34,7 +34,6 @@ import util.ItUtils; import static com.codeborne.selenide.Condition.text; import static com.codeborne.selenide.Selenide.$; -import static org.sonarqube.ws.client.project.UpdateVisibilityRequest.Visibility.PRIVATE; import static util.ItUtils.newAdminWsClient; import static util.ItUtils.projectDir; @@ -55,7 +54,7 @@ public class ProjectsAdministrationTest { public void return_all_projects_even_when_no_permission() throws Exception { orchestrator.executeBuild(SonarScanner.create(projectDir("shared/xoo-sample")).setProperties("sonar.projectKey", "sample1")); orchestrator.executeBuild(SonarScanner.create(projectDir("shared/xoo-sample")).setProperties("sonar.projectKey", "sample2")); - ItUtils.newAdminWsClient(orchestrator).projects().updateVisibility(new UpdateVisibilityRequest("sample2", PRIVATE)); + ItUtils.newAdminWsClient(orchestrator).projects().updateVisibility(UpdateVisibilityRequest.builder().setProject("sample2").setVisibility("private").build()); // Remove 'Admin' permission for admin group on project 2 -> No one can access or admin this project, expect System Admin newAdminWsClient(orchestrator).permissions().removeGroup(new RemoveGroupWsRequest().setProjectKey("sample2").setGroupName("sonar-administrators").setPermission("admin")); diff --git a/it/it-tests/src/test/java/it/authorisation/ExecuteAnalysisPermissionTest.java b/it/it-tests/src/test/java/it/authorisation/ExecuteAnalysisPermissionTest.java index 5ec88a35529..e315c731c44 100644 --- a/it/it-tests/src/test/java/it/authorisation/ExecuteAnalysisPermissionTest.java +++ b/it/it-tests/src/test/java/it/authorisation/ExecuteAnalysisPermissionTest.java @@ -37,7 +37,6 @@ import util.ItUtils; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; -import static org.sonarqube.ws.client.project.UpdateVisibilityRequest.Visibility.PRIVATE; import static util.ItUtils.newAdminWsClient; import static util.ItUtils.runProjectAnalysis; @@ -85,7 +84,7 @@ public class ExecuteAnalysisPermissionTest { "You're only authorized to execute a local (preview) SonarQube analysis without pushing the results to the SonarQube server. Please contact your SonarQube administrator."); } - ItUtils.newAdminWsClient(orchestrator).projects().updateVisibility(new UpdateVisibilityRequest(PROJECT_KEY, PRIVATE)); + ItUtils.newAdminWsClient(orchestrator).projects().updateVisibility(UpdateVisibilityRequest.builder().setProject(PROJECT_KEY).setVisibility("private").build()); try { // Execute anonymous analysis executeAnonymousAnalysis(); @@ -102,7 +101,7 @@ public class ExecuteAnalysisPermissionTest { executeAnonymousAnalysis(); // make project private - ItUtils.newAdminWsClient(orchestrator).projects().updateVisibility(new UpdateVisibilityRequest("sample", PRIVATE)); + ItUtils.newAdminWsClient(orchestrator).projects().updateVisibility(UpdateVisibilityRequest.builder().setProject("sample").setVisibility("private").build()); // still no error executeAnonymousAnalysis(); diff --git a/it/it-tests/src/test/java/it/authorisation/IssuePermissionTest.java b/it/it-tests/src/test/java/it/authorisation/IssuePermissionTest.java index 27d31d0e09e..5d50b39d2d4 100644 --- a/it/it-tests/src/test/java/it/authorisation/IssuePermissionTest.java +++ b/it/it-tests/src/test/java/it/authorisation/IssuePermissionTest.java @@ -40,7 +40,6 @@ import util.ItUtils; import static java.util.Arrays.asList; import static junit.framework.TestCase.fail; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonarqube.ws.client.project.UpdateVisibilityRequest.Visibility.PRIVATE; import static util.ItUtils.newAdminWsClient; import static util.ItUtils.newUserWsClient; import static util.ItUtils.projectDir; @@ -58,7 +57,7 @@ public class IssuePermissionTest { ItUtils.restoreProfile(orchestrator, getClass().getResource("/authorisation/one-issue-per-line-profile.xml")); orchestrator.getServer().provisionProject("privateProject", "PrivateProject"); - ItUtils.newAdminWsClient(orchestrator).projects().updateVisibility(new UpdateVisibilityRequest("privateProject", PRIVATE)); + ItUtils.newAdminWsClient(orchestrator).projects().updateVisibility(UpdateVisibilityRequest.builder().setProject("privateProject").setVisibility("private").build()); orchestrator.getServer().associateProjectToQualityProfile("privateProject", "xoo", "one-issue-per-line"); SonarScanner privateProject = SonarScanner.create(projectDir("shared/xoo-sample")) .setProperty("sonar.projectKey", "privateProject") |