diff options
Diffstat (limited to 'server/sonar-server/src/test/java')
2 files changed, 2 insertions, 17 deletions
diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/DeleteActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/DeleteActionTest.java index c6e9711f937..8b19fa4b1ec 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/DeleteActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/DeleteActionTest.java @@ -335,17 +335,6 @@ public class DeleteActionTest { } @Test - public void delete_specified_guarded_organization_if_exists_and_user_is_system_administrator() { - OrganizationDto organization = db.organizations().insert(dto -> dto.setGuarded(true)); - logInAsSystemAdministrator(); - - sendRequest(organization); - - verifyOrganizationDoesNotExist(organization); - verify(projectLifeCycleListeners).onProjectsDeleted(emptySet()); - } - - @Test @UseDataProvider("OneOrMoreIterations") public void delete_components_of_specified_organization(int numberOfIterations) { OrganizationDto organization = db.organizations().insert(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/SearchActionTest.java index aa52e7cc9fb..b190cb30202 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/SearchActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/SearchActionTest.java @@ -82,14 +82,11 @@ public class SearchActionTest { OrganizationDto userAdminOrganization = db.organizations().insert(); OrganizationDto groupAdminOrganization = db.organizations().insert(); OrganizationDto browseOrganization = db.organizations().insert(); - OrganizationDto guardedOrganization = db.organizations().insert(dto -> dto.setGuarded(true)); UserDto user = db.users().insertUser(); GroupDto group = db.users().insertGroup(groupAdminOrganization); db.users().insertMember(group, user); - userSession.logIn(user).addPermission(ADMINISTER, userAdminOrganization) - .addPermission(ADMINISTER, guardedOrganization); + userSession.logIn(user).addPermission(ADMINISTER, userAdminOrganization); db.users().insertPermissionOnUser(userAdminOrganization, user, ADMINISTER); - db.users().insertPermissionOnUser(guardedOrganization, user, ADMINISTER); db.users().insertPermissionOnGroup(group, ADMINISTER); SearchWsResponse result = call(ws.newRequest()); @@ -99,8 +96,7 @@ public class SearchActionTest { .containsExactlyInAnyOrder( tuple(userAdminOrganization.getKey(), true, true), tuple(browseOrganization.getKey(), false, false), - tuple(groupAdminOrganization.getKey(), true, true), - tuple(guardedOrganization.getKey(), true, false)); + tuple(groupAdminOrganization.getKey(), true, true)); } @Test |