From ce9e9057a102ea7e99d98a5c860bb5a3f9de3c77 Mon Sep 17 00:00:00 2001 From: Ancuta Morarasu Date: Wed, 11 May 2016 12:08:43 +0000 Subject: [PATCH] Merged HEAD (5.2) to 5.2.N (5.2.1) 126558 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 124298 jvonka: RA-834: Optionally request generation of a rendition on content creation (eg. file upload) - hmm, need to review whether it makes sense to request rendition for empty content (-> if it will fail) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126904 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/rest/api/tests/RenditionsTest.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/source/test-java/org/alfresco/rest/api/tests/RenditionsTest.java b/source/test-java/org/alfresco/rest/api/tests/RenditionsTest.java index f799e573bb..0cb5ff4ec5 100644 --- a/source/test-java/org/alfresco/rest/api/tests/RenditionsTest.java +++ b/source/test-java/org/alfresco/rest/api/tests/RenditionsTest.java @@ -484,16 +484,19 @@ public class RenditionsTest extends AbstractBaseApiTest assertNotNull(rendition); assertEquals(RenditionStatus.CREATED, rendition.getStatus()); - // also accepted for JSON when creating empty file (albeit with no content) + /* + // TODO open question + // - should we accept for JSON when creating empty file (ie. with zero-byte content) + // - eg. might fail, eg. doclib for empty plain text / pdf ? Document d1 = new Document(); - d1.setName("d1.txt"); + d1.setName("d1.pdf"); d1.setNodeType("cm:content"); ContentInfo ci = new ContentInfo(); - ci.setMimeType("text/plain"); + ci.setMimeType(MimetypeMap.MIMETYPE_TEXT_PLAIN); d1.setContent(ci); - // create empty file including request to generate imgpreview thumbnail - renditionName = "medium"; + // create empty file including request to generate a thumbnail + renditionName = "doclib"; response = post(getNodeChildrenUrl(folder_Id), userId, toJsonAsStringNonNull(d1), "?renditions="+renditionName, 201); Document documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class); String d1Id = documentResp.getId(); @@ -502,7 +505,7 @@ public class RenditionsTest extends AbstractBaseApiTest rendition = waitAndGetRendition(userId, d1Id, renditionName); assertNotNull(rendition); assertEquals(RenditionStatus.CREATED, rendition.getStatus()); - + */ // -ve - currently we do not support multiple rendition requests on create reqBody = MultiPartBuilder.create()