From d2bb3a980d16f363d20c92259f64ec571f72b7bb Mon Sep 17 00:00:00 2001 From: mikolajbrzezinski <86791239+mikolajbrzezinski@users.noreply.github.com> Date: Thu, 2 Sep 2021 07:50:17 -0400 Subject: [PATCH] Feature/acs 1835 test dau for deleted renditions (#689) * Deleted Renditions DAU Test Skeleton * Deleted Renditions DAU Test v1 * Deleted Renditions DAU Test v2 * Deleted Renditions DAU Test v3 * Deleted Renditions DAU Test v3.1 * Comments From Pull Request --- .../org/alfresco/rest/DeletedNodesTest.java | 41 ++++++++++++++++++- .../rest/api/tests/AbstractBaseApiTest.java | 5 +++ 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/remote-api/src/test/java/org/alfresco/rest/DeletedNodesTest.java b/remote-api/src/test/java/org/alfresco/rest/DeletedNodesTest.java index 0fb7f53415..b1d2f36d44 100644 --- a/remote-api/src/test/java/org/alfresco/rest/DeletedNodesTest.java +++ b/remote-api/src/test/java/org/alfresco/rest/DeletedNodesTest.java @@ -78,8 +78,6 @@ public class DeletedNodesTest extends AbstractSingleNetworkSiteTest protected static final String URL_DELETED_NODES = "deleted-nodes"; private static final String URL_RENDITIONS = "renditions"; - - private final static long DELAY_IN_MS = 500; @Override public void setup() throws Exception @@ -732,6 +730,45 @@ public class DeletedNodesTest extends AbstractSingleNetworkSiteTest HttpResponse dauResponse = post(getRequestArchivedContentDirectUrl(contentNodeId), null, null, null, null, 501); } + @Test + public void testRequestArchivedRenditionDirectUrl() throws Exception + { + setRequestContext(user1); + + // Create a folder within the site document's library + Date now = new Date(); + String folder1 = "folder" + now.getTime() + "_1"; + Folder createdFolder = createFolder(tDocLibNodeId, folder1, null); + assertNotNull(createdFolder); + String f1Id = createdFolder.getId(); + + // Create multipart request using an existing file + String fileName = "quick.pdf"; + File file = getResourceFile(fileName); + MultiPartBuilder multiPartBuilder = MultiPartBuilder.create().setFileData(new MultiPartBuilder.FileData(fileName, file)); + MultiPartBuilder.MultiPartRequest reqBody = multiPartBuilder.build(); + + // Upload quick.pdf file into 'folder' + HttpResponse response = post(getNodeChildrenUrl(f1Id), reqBody.getBody(), null, reqBody.getContentType(), 201); + Document document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class); + String contentNodeId = document.getId(); + + Rendition rendition = createAndGetRendition(contentNodeId, "doclib"); + assertNotNull(rendition); + String renditionID = rendition.getId(); + assertEquals(Rendition.RenditionStatus.CREATED, rendition.getStatus()); + + deleteNode(contentNodeId); + + HttpResponse dauResponse = post(getRequestArchivedRenditonContentDirectUrl(contentNodeId, renditionID), null, null, null, null, 501); + } + + private String addToDocumentLibrary(String name, String nodeType, String userId) throws Exception + { + String parentId = getSiteContainerNodeId(Nodes.PATH_MY, "documentLibrary"); + return createNode(parentId, name, nodeType, null).getId(); + } + private String getDeletedNodeRenditionsUrl(String nodeId) { return URL_DELETED_NODES + "/" + nodeId + "/" + URL_RENDITIONS; diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java index 568ad7c667..c6f0d16d77 100644 --- a/remote-api/src/test/java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java +++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java @@ -224,6 +224,11 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi return URL_DELETED_NODES + "/" + nodeId + "/" + REQUEST_DIRECT_ACCESS_URL; } + protected String getRequestArchivedRenditonContentDirectUrl(String nodeId, String renditionID) + { + return URL_DELETED_NODES + "/" + nodeId + "/" + URL_RENDITIONS + "/" + renditionID + "/" + REQUEST_DIRECT_ACCESS_URL; + } + /** * The api scope. either public or private *