inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

REPO-2557, ALF-21907 Added a new test szenario where the node creator is tested if he can delete the locked node.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137779 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Martin Muller
2017-06-23 10:56:29 +00:00
parent 270ab7e87d
commit 862ca386fb
1 changed files with 48 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
source/test-java/org/alfresco/rest/api/tests/TestNodeComments.java
View File

@@ -794,6 +794,19 @@ public class TestNodeComments extends EnterpriseTestApi
{ {
publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId())); publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
{
@Override
public Void doWork() throws Exception
{
TestSite site = sites.get(0);
site.updateMember(person13.getId(), SiteRole.SiteManager);
site.updateMember(person14.getId(), SiteRole.SiteManager);
return null;
}
}, person11.getId(), network1.getId());
Comment comment = new Comment(); Comment comment = new Comment();
comment.setContent("my comment"); comment.setContent("my comment");
Comment createdComment = commentsProxy.createNodeComment(nodeRef1.getId(), comment); Comment createdComment = commentsProxy.createNodeComment(nodeRef1.getId(), comment);
@@ -845,18 +858,17 @@ public class TestNodeComments extends EnterpriseTestApi
assertEquals(HttpStatus.SC_CONFLICT, e.getHttpResponse().getStatusCode()); assertEquals(HttpStatus.SC_CONFLICT, e.getHttpResponse().getStatusCode());
} }
//TODO Insert after fixing REPO-2577
// test DELETE for a locked node // test DELETE for a locked node
// try try
// { {
// commentsProxy.removeNodeComment(nodeRef1.getId(), createdComment.getId()); commentsProxy.removeNodeComment(nodeRef1.getId(), createdComment.getId());
//
// fail(""); fail("");
// } }
// catch (PublicApiException e) catch (PublicApiException e)
// { {
// assertEquals(HttpStatus.SC_CONFLICT, e.getHttpResponse().getStatusCode()); assertEquals(HttpStatus.SC_CONFLICT, e.getHttpResponse().getStatusCode());
// } }
// change to node creator // change to node creator
publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId())); publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
@@ -889,18 +901,17 @@ public class TestNodeComments extends EnterpriseTestApi
assertEquals(HttpStatus.SC_CONFLICT, e.getHttpResponse().getStatusCode()); assertEquals(HttpStatus.SC_CONFLICT, e.getHttpResponse().getStatusCode());
} }
//TODO Insert after fixing REPO-2577
// test DELETE for a locked node // test DELETE for a locked node
// try try
// { {
// commentsProxy.removeNodeComment(nodeRef1.getId(), createdComment.getId()); commentsProxy.removeNodeComment(nodeRef1.getId(), createdComment.getId());
//
// fail(""); fail("");
// } }
// catch (PublicApiException e) catch (PublicApiException e)
// { {
// assertEquals(HttpStatus.SC_CONFLICT, e.getHttpResponse().getStatusCode()); assertEquals(HttpStatus.SC_CONFLICT, e.getHttpResponse().getStatusCode());
// } }
// change to lock owner // change to lock owner
publicApiClient.setRequestContext(new RequestContext(network1.getId(), person13.getId())); publicApiClient.setRequestContext(new RequestContext(network1.getId(), person13.getId()));
@@ -923,6 +934,7 @@ public class TestNodeComments extends EnterpriseTestApi
} }
finally finally
{ {
// undo the lock
TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>() TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
{ {
@Override @Override
@@ -932,6 +944,20 @@ public class TestNodeComments extends EnterpriseTestApi
return null; return null;
} }
}, person13.getId(), network1.getId()); }, person13.getId(), network1.getId());
// put the other members back to SiteCollaborator
TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
{
@Override
public Void doWork() throws Exception
{
TestSite site = sites.get(0);
site.updateMember(person13.getId(), SiteRole.SiteCollaborator);
site.updateMember(person14.getId(), SiteRole.SiteCollaborator);
return null;
}
}, person11.getId(), network1.getId());
} }
} }