From f4bbfa35d4334b3ad6e9a472274ef5fa250f8777 Mon Sep 17 00:00:00 2001 From: Jamal Kaabi-Mofrad Date: Tue, 10 May 2016 11:29:25 +0000 Subject: [PATCH] Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 124331 jvonka: RA-834, RA-678: Optionally request generation of a rendition on content creation (eg. file upload) - one more attempt (works locally, but for some reason is failing on build machines) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126561 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/rest/api/tests/RenditionsTest.java | 4 ++-- .../upload/farmers_markets_list_2003.doc | Bin 0 -> 30208 bytes 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 source/test-resources/publicapi/upload/farmers_markets_list_2003.doc 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 58e357b058..0ca390c49d 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 = "quick.docx"; + fileName = "farmers_markets_list_2003.doc"; file = getResourceFile(fileName); reqBody = MultiPartBuilder.create() - .setFileData(new FileData(fileName, file, MimetypeMap.MIMETYPE_OPENXML_WORDPROCESSING)) + .setFileData(new FileData(fileName, file, MimetypeMap.MIMETYPE_WORD)) .setRenditions(Collections.singletonList(renditionName)) .build(); diff --git a/source/test-resources/publicapi/upload/farmers_markets_list_2003.doc b/source/test-resources/publicapi/upload/farmers_markets_list_2003.doc new file mode 100644 index 0000000000000000000000000000000000000000..f6ce700a1aaa8ca4a158bfac68f9a946f0114056 GIT binary patch literal 30208 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 H<-PxZXyxrC literal 0 HcmV?d00001