From 3d51ad151c7bdd97aae6e269f8bd65c661f6d36d Mon Sep 17 00:00:00 2001 From: Ancuta Morarasu Date: Wed, 11 May 2016 12:13:39 +0000 Subject: [PATCH] Merged HEAD (5.2) to 5.2.N (5.2.1) 126591 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 124824 gjames: RA-847, RA-848 Retrieving deleted nodes as Admin git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126936 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/rest/DeletedNodesTest.java | 36 ++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/source/test-java/org/alfresco/rest/DeletedNodesTest.java b/source/test-java/org/alfresco/rest/DeletedNodesTest.java index 4f560fdeaa..db5202713d 100644 --- a/source/test-java/org/alfresco/rest/DeletedNodesTest.java +++ b/source/test-java/org/alfresco/rest/DeletedNodesTest.java @@ -73,7 +73,7 @@ public class DeletedNodesTest extends AbstractSingleNetworkSiteTest Document document = createDocument(createdFolder, "d1.txt"); Document documentNotDeleted = createDocument(createdFolder, "notdeleted1.txt"); - PublicApiClient.Paging paging = getPaging(0, 100); + PublicApiClient.Paging paging = getPaging(0, 5); //First get any deleted nodes HttpResponse response = getAll(URL_DELETED_NODES, u1.getId(), paging, 200); List nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class); @@ -107,8 +107,42 @@ public class DeletedNodesTest extends AbstractSingleNetworkSiteTest assertEquals(u1.getId(), fNode.getArchivedByUser().getId()); assertTrue(fNode.getArchivedAt().after(now)); + //The list is ordered with the most recently deleted node first + checkDeletedNodes(now, createdFolder, createdFolderNonSite, document, nodes); + //Invalid node ref response = getSingle(URL_DELETED_NODES, u1.getId(), "iddontexist", 404); + assertNotNull(response); + + //Now as admin + publicApiClient.setRequestContext(new RequestContext(networkOne.getId(), "admin@"+networkOne.getId(), "admin")); + response = publicApiClient.get(getScope(), URL_DELETED_NODES, null, null, null, createParams(paging, null)); + checkStatus(200, response.getStatusCode()); + nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class); + assertNotNull(nodes); + checkDeletedNodes(now, createdFolder, createdFolderNonSite, document, nodes); + } + + protected void checkDeletedNodes(Date now, Folder createdFolder, Folder createdFolderNonSite, Document document, List nodes) + { + Node aNode = (Node) nodes.get(0); + assertNotNull(aNode); + assertEquals("This folder was deleted most recently", createdFolderNonSite.getId(), aNode.getId()); + assertEquals(u1.getId(), aNode.getArchivedByUser().getId()); + assertTrue(aNode.getArchivedAt().after(now)); + + Node folderNode = (Node) nodes.get(1); + assertNotNull(folderNode); + assertEquals(createdFolder.getId(), folderNode.getId()); + assertEquals(u1.getId(), folderNode.getArchivedByUser().getId()); + assertTrue(folderNode.getArchivedAt().after(now)); + assertTrue("This folder was deleted before the non-site folder", folderNode.getArchivedAt().before(aNode.getArchivedAt())); + + aNode = (Node) nodes.get(2); + assertNotNull(aNode); + assertEquals(document.getId(), aNode.getId()); + assertEquals(u1.getId(), aNode.getArchivedByUser().getId()); + assertTrue(aNode.getArchivedAt().after(now)); } }