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

Browse Source 
126596 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      124839 gjames: RA-848: Adding a permissions check test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126941 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 12:14:23 +00:00
parent 4fbea2881d
commit 4dd8604cb8
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/test-java/org/alfresco/rest/DeletedNodesTest.java
View File

@@ -58,6 +58,14 @@ public class DeletedNodesTest extends AbstractSingleNetworkSiteTest
{ {
protected static final String URL_DELETED_NODES = "deleted-nodes"; protected static final String URL_DELETED_NODES = "deleted-nodes";
private RepoService.TestPerson u2;
@Override
public void setup() throws Exception
{
super.setup();
u2 = networkOne.createUser();
}
@Test @Test
public void testCreateAndDelete() throws Exception public void testCreateAndDelete() throws Exception
@@ -112,6 +120,9 @@ public class DeletedNodesTest extends AbstractSingleNetworkSiteTest
//The list is ordered with the most recently deleted node first //The list is ordered with the most recently deleted node first
checkDeletedNodes(now, createdFolder, createdFolderNonSite, document, nodes); checkDeletedNodes(now, createdFolder, createdFolderNonSite, document, nodes);
//User 2 can't get it but user 1 can.
response = getSingle(URL_DELETED_NODES, u2.getId(), createdFolderNonSite.getId(), Status.STATUS_FORBIDDEN);
//Invalid node ref //Invalid node ref
response = getSingle(URL_DELETED_NODES, u1.getId(), "iddontexist", 404); response = getSingle(URL_DELETED_NODES, u1.getId(), "iddontexist", 404);
assertNotNull(response); assertNotNull(response);
@@ -159,7 +170,6 @@ public class DeletedNodesTest extends AbstractSingleNetworkSiteTest
//Can't delete "nonsense" noderef //Can't delete "nonsense" noderef
response = post("deleted-nodes/nonsense/restore", u1.getId(), null, null, Status.STATUS_NOT_FOUND); response = post("deleted-nodes/nonsense/restore", u1.getId(), null, null, Status.STATUS_NOT_FOUND);
RepoService.TestPerson u2 = networkOne.createUser();
//User 2 can't restore it but user 1 can. //User 2 can't restore it but user 1 can.
response = post("deleted-nodes/"+createdFolder.getId()+"/restore", u2.getId(), null, null, Status.STATUS_FORBIDDEN); response = post("deleted-nodes/"+createdFolder.getId()+"/restore", u2.getId(), null, null, Status.STATUS_FORBIDDEN);
response = post("deleted-nodes/"+createdFolder.getId()+"/restore", u1.getId(), null, null, 201); response = post("deleted-nodes/"+createdFolder.getId()+"/restore", u1.getId(), null, null, 201);