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

fix for CLOUD-2150: Trashcan for network admins only shows their deleted content.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@57583 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jamal Kaabi-Mofrad
2013-11-04 10:10:02 +00:00
parent 6a5e3923a7
commit fa8910384a
5 changed files with 139 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/test-java/org/alfresco/repo/node/archive/ArchiveAndRestoreTest.java
View File

@@ -953,13 +953,13 @@ public class ArchiveAndRestoreTest extends TestCase
this.archiveStoreRootNodeRef, paging).filterIgnoreCase(true).build();
// Query the DB
PagingResults<NodeRef> result = nodeArchiveService.listArchivedNodes(queryBuilder);
PagingResults<NodeRef> result = runListArchivedNodesAsAdmin(queryBuilder);
assertEquals("USER_B hasn't deleted anything yet.", 0, result.getPage().size());
// USER_B deletes "bb"
nodeService.deleteNode(bb);
result = nodeArchiveService.listArchivedNodes(queryBuilder);
result = runListArchivedNodesAsAdmin(queryBuilder);
assertEquals("USER_B deleted only 1 item.", 1, result.getPage().size());
AuthenticationUtil.setFullyAuthenticatedUser(USER_A);
@@ -971,7 +971,7 @@ public class ArchiveAndRestoreTest extends TestCase
this.archiveStoreRootNodeRef, paging)
.filterIgnoreCase(true).build();
result = nodeArchiveService.listArchivedNodes(queryBuilder);
result = runListArchivedNodesAsAdmin(queryBuilder);
assertEquals("USER_A deleted only 1 item.", 1, result.getPage().size());
assertEquals(QNAME_AA.getLocalName(),
nodeService.getProperty(result.getPage().get(0), ContentModel.PROP_NAME));
@@ -988,6 +988,18 @@ public class ArchiveAndRestoreTest extends TestCase
assertEquals("Admin can retrieve all users' deleted nodes.", 2, result.getPage().size());
}
private PagingResults<NodeRef> runListArchivedNodesAsAdmin(final ArchivedNodesCannedQueryBuilder queryBuilder)
{
return AuthenticationUtil.runAs(new RunAsWork<PagingResults<NodeRef>>()
{
@Override
public PagingResults<NodeRef> doWork() throws Exception
{
return nodeArchiveService.listArchivedNodes(queryBuilder);
}
}, AuthenticationUtil.getAdminUserName());
}
/**
* Test listArchivedNodes sorted by ARCHIVED_DATE (DESC).
*/