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

Merged mward/5.2.n-repo-1583-groupmem (5.2.1) to 5.2.N (5.2.1)

Browse Source 
134377 mward: REPO-1583: non-admin now supported
   Also added tests for paging.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@134401 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Matt Ward
2017-01-17 14:22:12 +00:00
parent 897cd62fa2
commit 3b41c8a4eb
2 changed files with 80 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -415,10 +415,28 @@ public class GroupsTest extends AbstractSingleNetworkSiteTest
return groupsProxy.getGroupMembers(groupId, createParams(paging, otherParams), errorMessage, expectedStatus);
}
private ListResponse<Group> getGroupsByPersonId(String userId, final PublicApiClient.Paging paging, Map<String, String> otherParams, String errorMessage, int expectedStatus) throws Exception
private ListResponse<Group> getGroupsByPersonId(String userId, final PublicApiClient.Paging paging,
Map<String, String> otherParams) throws Exception
{
return getGroupsByPersonId(
userId,
paging,
otherParams,
HttpServletResponse.SC_OK);
}
private ListResponse<Group> getGroupsByPersonId(
String userId,
final PublicApiClient.Paging paging,
Map<String, String> otherParams,
int expectedStatus) throws Exception
{
final Groups groupsProxy = publicApiClient.groups();
return groupsProxy.getGroupsByPersonId(userId, createParams(paging, otherParams), errorMessage, expectedStatus);
return groupsProxy.getGroupsByPersonId(
userId,
createParams(paging, otherParams),
"Incorrect response when getting groups for user ID " + userId,
expectedStatus);
}
private ListResponse<GroupMember> getGroupMembers(String groupId, final PublicApiClient.Paging paging, Map<String, String> otherParams) throws Exception
@@ -460,7 +478,7 @@ public class GroupsTest extends AbstractSingleNetworkSiteTest
}
}
private void canGetGroupsForUserId() throws ParseException, PublicApiException
private void canGetGroupsForUserId() throws Exception
{
Person personAlice;
{
@@ -525,18 +543,49 @@ public class GroupsTest extends AbstractSingleNetworkSiteTest
}
// As Alice
// setRequestContext(networkOne.getId(), personAlice.getId(), "password");
setRequestContext(networkOne.getId(), personAlice.getId(), "password");
// test -me- alias as Alice
// {
// ListResponse<Group> groups = groupsProxy.getGroupsByPersonId("-me-", null, "Couldn't get user's groups", 200);
// assertEquals(4L, (long) groups.getPaging().getCount());
// Iterator<Group> it = groups.getList().iterator();
// assertEquals("GROUP_EVERYONE", it.next().getId());
// assertEquals(rootGroupName, it.next().getId());
// assertEquals(groupA, it.next());
// assertEquals(groupB, it.next());
// }
{
ListResponse<Group> groups = groupsProxy.getGroupsByPersonId("-me-", null, "Couldn't get user's groups", 200);
assertEquals(4L, (long) groups.getPaging().getCount());
Iterator<Group> it = groups.getList().iterator();
assertEquals("GROUP_EVERYONE", it.next().getId());
assertEquals(rootGroupName, it.next().getId());
assertEquals(groupA, it.next());
assertEquals(groupB, it.next());
}
// +ve: check skip count.
{
// Sort params
Map<String, String> otherParams = new HashMap<>();
addOrderBy(otherParams, org.alfresco.rest.api.Groups.PARAM_DISPLAY_NAME, false);
// Paging and list groups
int skipCount = 0;
int maxItems = 4;
Paging paging = getPaging(skipCount, maxItems);
ListResponse<Group> resp = getGroupsByPersonId(personAlice.getId(), paging, otherParams);
// Paging and list groups with skip count.
skipCount = 2;
maxItems = 2;
paging = getPaging(skipCount, maxItems);
ListResponse<Group> sublistResponse = getGroupsByPersonId(personAlice.getId(), paging, otherParams);
List<Group> expectedSublist = sublist(resp.getList(), skipCount, maxItems);
checkList(expectedSublist, sublistResponse.getPaging(), sublistResponse);
}
// -ve: check skip count.
{
getGroupsByPersonId(personAlice.getId(), getPaging(-1, null), null, HttpServletResponse.SC_BAD_REQUEST);
}
}
private void testGetGroupMembersByGroupId() throws Exception