inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

REPO-1305: Delete a group

Browse Source 
- first version

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@134676 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Cristian Turlica
2017-01-20 13:46:59 +00:00
parent debae96be4
commit 688a068f2a
6 changed files with 165 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
source/test-java/org/alfresco/rest/api/tests/GroupsTest.java
View File

@@ -890,6 +890,22 @@ public class GroupsTest extends AbstractSingleNetworkSiteTest
groupsProxy.createGroup(group, null, HttpServletResponse.SC_CREATED);
groupsProxy.createGroup(group, null, HttpServletResponse.SC_CONFLICT);
}
// Create subgroup with invalid parent.
{
setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
Map<String, String> otherParams = new HashMap<>();
otherParams.put("include", org.alfresco.rest.api.Groups.PARAM_INCLUDE_PARENT_IDS);
Set<String> subGroupParents = new HashSet<>();
subGroupParents.add("invalidId");
Group subGroup = generateGroup();
subGroup.setParentIds(subGroupParents);
groupsProxy.createGroup(subGroup, otherParams, HttpServletResponse.SC_NOT_FOUND);
}
}
@Test
@@ -959,6 +975,70 @@ public class GroupsTest extends AbstractSingleNetworkSiteTest
}
}
@Test
public void testDeleteGroup() throws Exception
{
final Groups groupsProxy = publicApiClient.groups();
Map<String, String> otherParams = new HashMap<>();
otherParams.put("include", org.alfresco.rest.api.Groups.PARAM_INCLUDE_PARENT_IDS);
setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
Group group = groupsProxy.createGroup(generateGroup(), otherParams, HttpServletResponse.SC_CREATED);
// User without admin rights can't delete a group.
{
setRequestContext(user1);
groupsProxy.deleteGroup(group.getId(), false, HttpServletResponse.SC_FORBIDDEN);
}
// Invalid auth.
{
setRequestContext(networkOne.getId(), GUID.generate(), "password");
groupsProxy.deleteGroup("invalidId", false, HttpServletResponse.SC_UNAUTHORIZED);
}
// Group id doesn't exist.
{
setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
groupsProxy.deleteGroup("GROUP_invalidId", false, HttpServletResponse.SC_NOT_FOUND);
}
// Trying to modify a fixed authority.
{
setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
groupsProxy.deleteGroup("admin", false, HttpServletResponse.SC_CONFLICT);
}
{
Group groupLevel1 = groupsProxy.createGroup(generateGroup(), otherParams, HttpServletResponse.SC_CREATED);
Group groupLevel2 = groupsProxy.createGroup(generateSubGroup(groupLevel1), otherParams, HttpServletResponse.SC_CREATED);
Group groupLevel3 = groupsProxy.createGroup(generateSubGroup(groupLevel2), otherParams, HttpServletResponse.SC_CREATED);
// Delete the primary root (no cascade)
groupsProxy.deleteGroup(groupLevel1.getId(), false, HttpServletResponse.SC_NO_CONTENT);
groupsProxy.getGroup(groupLevel1.getId(), HttpServletResponse.SC_NOT_FOUND);
// Check that second level group is now root.
groupLevel2 = groupsProxy.getGroup(groupLevel2.getId(), HttpServletResponse.SC_OK);
assertTrue(groupLevel2.getIsRoot());
// Check that third level group wasn't deleted.
groupsProxy.getGroup(groupLevel3.getId(), HttpServletResponse.SC_OK);
// Delete new root with cascade.
groupsProxy.deleteGroup(groupLevel2.getId(), true, HttpServletResponse.SC_NO_CONTENT);
// Check that delete with cascade worked.
groupsProxy.getGroup(groupLevel2.getId(), HttpServletResponse.SC_NOT_FOUND);
groupsProxy.getGroup(groupLevel2.getId(), HttpServletResponse.SC_NOT_FOUND);
}
}
private Group generateGroup()
{
Group group = new Group();
@@ -966,4 +1046,20 @@ public class GroupsTest extends AbstractSingleNetworkSiteTest
return group;
}
private Group generateSubGroup(Group parentGroup)
{
Set<String> subGroupParents = new HashSet<>();
if (parentGroup.getParentIds() != null && !parentGroup.getParentIds().isEmpty())
{
subGroupParents.addAll(parentGroup.getParentIds());
}
subGroupParents.add(parentGroup.getId());
Group subGroup = generateGroup();
subGroup.setParentIds(subGroupParents);
return subGroup;
}
}

10
source/test-java/org/alfresco/rest/api/tests/client/PublicApiClient.java
View File

@@ -2311,6 +2311,16 @@ public class PublicApiClient
return parseGroupEntity(response);
}
public void deleteGroup(String groupId, boolean cascade, int expectedStatus) throws PublicApiException
{
Map<String, String> params = null;
if (cascade)
{
params = Collections.singletonMap("cascade", "true");
}
remove("groups", groupId, null, null, params, "Failed to remove site", expectedStatus);
}
private Group parseGroupEntity(HttpResponse response)
{
if ((response != null) && (response.getJsonResponse() != null))