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-1307: Create group membership

Browse Source 
- Added create group membership functionality
   - Added tests

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@134750 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Raluca Munteanu
2017-01-25 11:57:40 +00:00
parent 216d34a03e
commit fe089c7651
5 changed files with 243 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,6 +25,22 @@
*/
package org.alfresco.rest.api.tests;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import javax.servlet.http.HttpServletResponse;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.rest.AbstractSingleNetworkSiteTest;
import org.alfresco.rest.api.tests.client.PublicApiClient;
@@ -44,12 +60,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import javax.servlet.http.HttpServletResponse;
import java.text.ParseException;
import java.util.*;
import static org.junit.Assert.*;
/**
* V1 REST API tests for managing Groups
*
@@ -57,6 +67,9 @@ import static org.junit.Assert.*;
*/
public class GroupsTest extends AbstractSingleNetworkSiteTest
{
private static final String MEMBER_TYPE_GROUP = "GROUP";
private static final String MEMBER_TYPE_PERSON = "PERSON";
protected AuthorityService authorityService;
private String rootGroupName = null;
@@ -371,9 +384,11 @@ public class GroupsTest extends AbstractSingleNetworkSiteTest
groupMemberA = new GroupMember();
groupMemberA.setId(groupAAuthorityName);
groupMemberA.setMemberType(AuthorityType.GROUP.toString());
groupMemberB = new GroupMember();
groupMemberB.setId(groupBAuthorityName);
groupMemberB.setMemberType(AuthorityType.GROUP.toString());
}
}
@@ -917,6 +932,101 @@ public class GroupsTest extends AbstractSingleNetworkSiteTest
}
}
@Test
public void testCreateGroupMembers() throws PublicApiException
{
final Groups groupsProxy = publicApiClient.groups();
try
{
createAuthorityContext(user1);
Person personAlice;
{
publicApiClient.setRequestContext(new RequestContext(networkOne.getId(), networkAdmin, "admin"));
personAlice = new Person();
String aliceId = "alice-" + UUID.randomUUID() + "@" + networkOne.getId();
personAlice.setUserName(aliceId);
personAlice.setId(aliceId);
personAlice.setFirstName("Alice");
personAlice.setEmail("alison.smith@example.com");
personAlice.setPassword("password");
personAlice.setEnabled(true);
PublicApiClient.People people = publicApiClient.people();
people.create(personAlice);
}
// +ve tests
// Create a group membership (for a existing person and a sub-group)
// within a group groupId
{
GroupMember personMember = new GroupMember();
personMember.setId(personAlice.getId());
personMember.setMemberType(MEMBER_TYPE_PERSON);
// Add person as groupB member
groupsProxy.createGroupMember(groupB.getId(), personMember, HttpServletResponse.SC_CREATED);
// Add group as groupB sub-group
groupsProxy.createGroupMember(groupB.getId(), groupMemberA, HttpServletResponse.SC_CREATED);
}
// If the added sub-group was previously a root group then it
// becomes a non-root group since it now has a parent.
{
// create a group without parent
Group groupRoot = generateGroup();
Group groupRootCreated = groupsProxy.createGroup(groupRoot, null, HttpServletResponse.SC_CREATED);
assertTrue("Group was expected to be root.", groupRootCreated.getIsRoot());
GroupMember groupMember = new GroupMember();
groupMember.setId(groupRootCreated.getId());
groupMember.setMemberType(MEMBER_TYPE_GROUP);
groupsProxy.createGroupMember(groupB.getId(), groupMember, HttpServletResponse.SC_CREATED);
Group subGroup = groupsProxy.getGroup(groupMember.getId());
assertFalse("Group was expected to be sub-group.", subGroup.getIsRoot());
}
// Person or group with given id does not exists
{
GroupMember invalidIdGroupMember = new GroupMember();
invalidIdGroupMember.setId("invalidPersonId-" + GUID.generate());
invalidIdGroupMember.setMemberType(MEMBER_TYPE_PERSON);
groupsProxy.createGroupMember(groupA.getId(), invalidIdGroupMember, HttpServletResponse.SC_NOT_FOUND);
invalidIdGroupMember.setMemberType(MEMBER_TYPE_GROUP);
groupsProxy.createGroupMember(groupA.getId(), invalidIdGroupMember, HttpServletResponse.SC_NOT_FOUND);
}
// Invalid group Id
{
groupsProxy.createGroupMember("invalidGroupId", groupMemberA, HttpServletResponse.SC_NOT_FOUND);
}
// Invalid group member
{
GroupMember invalidGroupMember = new GroupMember();
groupsProxy.createGroupMember(groupA.getId(), invalidGroupMember, HttpServletResponse.SC_BAD_REQUEST);
// Member type still missing
invalidGroupMember.setId("Test_" + GUID.generate());
groupsProxy.createGroupMember(groupA.getId(), invalidGroupMember, HttpServletResponse.SC_BAD_REQUEST);
// invalid member type
invalidGroupMember.setMemberType("invalidMemberType");
groupsProxy.createGroupMember(groupA.getId(), invalidGroupMember, HttpServletResponse.SC_BAD_REQUEST);
}
// -ve tests
// Add group with non-admin user
{
setRequestContext(user1);
groupsProxy.createGroupMember(groupA.getId(), groupMemberA, HttpServletResponse.SC_FORBIDDEN);
}
}
finally
{
clearAuthorityContext();
}
}
@Test
public void testUpdateGroup() throws Exception
{

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

@@ -70,8 +70,6 @@ import org.alfresco.rest.api.tests.client.data.SiteImpl;
import org.alfresco.rest.api.tests.client.data.SiteMember;
import org.alfresco.rest.api.tests.client.data.SiteMembershipRequest;
import org.alfresco.rest.api.tests.client.data.Tag;
import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
import org.alfresco.rest.framework.resource.parameters.Parameters;
import org.apache.chemistry.opencmis.client.api.CmisObject;
import org.apache.chemistry.opencmis.client.api.Document;
import org.apache.chemistry.opencmis.client.api.FileableCmisObject;
@@ -2289,6 +2287,25 @@ public class PublicApiClient
return parseGroupEntity(response);
}
public GroupMember createGroupMember(String groupId, GroupMember groupMember) throws PublicApiException
{
return createGroupMember(groupId, groupMember, HttpServletResponse.SC_OK);
}
public GroupMember createGroupMember(String groupId, GroupMember groupMember, int expectedStatus) throws PublicApiException
{
HttpResponse response = create("groups", groupId, "members", null, groupMember.toJSON().toString(), "Failed to create group membership", expectedStatus);
if (response != null && response.getJsonResponse() != null)
{
JSONObject jsonEntity = (JSONObject) response.getJsonResponse().get("entry");
if (jsonEntity != null)
{
return GroupMember.parseGroupMember(response.getJsonResponse());
}
}
return null;
}
public Group updateGroup(String groupId, Group group, Map<String, String> params, int expectedStatus) throws PublicApiException
{
HttpResponse response = update("groups", groupId, null, null, group.toJSON().toString(), params, "Failed to update group " + group.getId(), expectedStatus);