From 205ee78b7aa3661d079d7883d3a4759566c4e6b1 Mon Sep 17 00:00:00 2001 From: Jamal Kaabi-Mofrad Date: Tue, 10 May 2016 11:29:08 +0000 Subject: [PATCH] Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 124327 jvonka: RA-834, RA-678: Optionally request generation of a rendition on content creation (eg. file upload) - add/fix missing test file git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126560 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/rest/api/tests/RenditionsTest.java | 4 ++-- .../test-resources/publicapi/upload/quick.docx | Bin 0 -> 10197 bytes 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 source/test-resources/publicapi/upload/quick.docx 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 551a24a5ed..58e357b058 100644 --- a/source/test-java/org/alfresco/rest/api/tests/RenditionsTest.java +++ b/source/test-java/org/alfresco/rest/api/tests/RenditionsTest.java @@ -488,10 +488,10 @@ public class RenditionsTest extends AbstractBaseApiTest // Create multipart request - Word doc file renditionName = "doclib"; - fileName = "CAP-v1.2-os.doc"; + fileName = "quick.docx"; file = getResourceFile(fileName); reqBody = MultiPartBuilder.create() - .setFileData(new FileData(fileName, file, MimetypeMap.MIMETYPE_WORD)) + .setFileData(new FileData(fileName, file, MimetypeMap.MIMETYPE_OPENXML_WORDPROCESSING)) .setRenditions(Collections.singletonList(renditionName)) .build(); diff --git a/source/test-resources/publicapi/upload/quick.docx b/source/test-resources/publicapi/upload/quick.docx new file mode 100644 index 0000000000000000000000000000000000000000..64832464bb86602d082d6cab00cb0271175cf071 GIT binary patch literal 10197 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 literal 0 HcmV?d00001