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 5.2.N (5.2.1) to HEAD (5.2)

Browse Source 
130888 jvonka: REPO-1027: V1 REST API - fix error handling (update / remove site member)
   - already fix on 5.2(.N) so simply add -ve api tests
   - ACE-5444


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132202 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-11-03 13:29:11 +00:00
parent 57b96f4b38
commit ac42e10d6a
1 changed files with 43 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
source/test-java/org/alfresco/rest/api/tests/TestSiteMembers.java
View File

@@ -441,6 +441,8 @@ public class TestSiteMembers extends EnterpriseTestApi
people.add(person); people.add(person);
person = network1.createUser(); person = network1.createUser();
people.add(person); people.add(person);
person = network1.createUser();
people.add(person);
return null; return null;
} }
@@ -448,6 +450,7 @@ public class TestSiteMembers extends EnterpriseTestApi
TestPerson person1 = people.get(0); TestPerson person1 = people.get(0);
TestPerson person2 = people.get(1); TestPerson person2 = people.get(1);
TestPerson person3 = people.get(2);
// Create site // Create site
TestSite site = TenantUtil.runAsUserTenant(new TenantRunAsWork<TestSite>() TestSite site = TenantUtil.runAsUserTenant(new TenantRunAsWork<TestSite>()
@@ -481,6 +484,14 @@ public class TestSiteMembers extends EnterpriseTestApi
SiteMember siteMember = sitesProxy.createSiteMember(site.getSiteId(), new SiteMember(person1.getId(), SiteRole.SiteContributor.toString())); SiteMember siteMember = sitesProxy.createSiteMember(site.getSiteId(), new SiteMember(person1.getId(), SiteRole.SiteContributor.toString()));
assertEquals(person1.getId(), siteMember.getMemberId()); assertEquals(person1.getId(), siteMember.getMemberId());
assertEquals(SiteRole.SiteContributor.toString(), siteMember.getRole()); assertEquals(SiteRole.SiteContributor.toString(), siteMember.getRole());
siteMember.setSiteId(site.getSiteId()); // note: needed for contains check below, ugh
// create another site member
publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
SiteMember siteMemberAno = sitesProxy.createSiteMember(site.getSiteId(), new SiteMember(person3.getId(), SiteRole.SiteCollaborator.toString()));
assertEquals(person3.getId(), siteMemberAno.getMemberId());
assertEquals(SiteRole.SiteCollaborator.toString(), siteMemberAno.getRole());
siteMemberAno.setSiteId(site.getSiteId()); // note: needed for contains check below, ugh
// unknown site // unknown site
try try
@@ -506,6 +517,34 @@ public class TestSiteMembers extends EnterpriseTestApi
assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode()); assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
} }
// ACE-5444
// cannot update site member (without appropriate site "permission" - see SiteService)
try
{
publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
sitesProxy.updateSiteMember(site.getSiteId(), new SiteMember(person1.getId(), SiteRole.SiteCollaborator.toString()));
fail();
}
catch(PublicApiException e)
{
assertEquals(HttpStatus.SC_UNPROCESSABLE_ENTITY, e.getHttpResponse().getStatusCode());
}
// ACE-5444
// cannot remove another site member (without appropriate site "permission" - see SiteService)
try
{
publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
sitesProxy.removeSiteMember(site.getSiteId(), new SiteMember(person3.getId()));
fail();
}
catch(PublicApiException e)
{
assertEquals(HttpStatus.SC_UNPROCESSABLE_ENTITY, e.getHttpResponse().getStatusCode());
}
// remove site member
{ {
publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId())); publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
sitesProxy.removeSiteMember(site.getSiteId(), siteMember); sitesProxy.removeSiteMember(site.getSiteId(), siteMember);
@@ -514,6 +553,7 @@ public class TestSiteMembers extends EnterpriseTestApi
// check site membership in GET // check site membership in GET
List<SiteMember> expectedSiteMembers = site.getMembers(); List<SiteMember> expectedSiteMembers = site.getMembers();
assertFalse(expectedSiteMembers.contains(siteMember)); assertFalse(expectedSiteMembers.contains(siteMember));
assertTrue(expectedSiteMembers.contains(siteMemberAno));
{ {
int skipCount = 0; int skipCount = 0;