inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)

Browse Source 
124300 jvonka: RA-834, RA-678: Optionally request generation of a rendition on content creation (eg. file upload)
   - more test tweaks


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126559 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jamal Kaabi-Mofrad
2016-05-10 11:28:49 +00:00
parent 158cafb9cc
commit 5ff4c963c0
1 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
source/test-java/org/alfresco/rest/api/tests/RenditionsTest.java
View File

@@ -409,6 +409,8 @@ public class RenditionsTest extends AbstractBaseApiTest
String emptyContentNodeId = addToDocumentLibrary(userOneN1Site, "emptyDoc.txt", ContentModel.TYPE_CONTENT, userOneN1.getId()); String emptyContentNodeId = addToDocumentLibrary(userOneN1Site, "emptyDoc.txt", ContentModel.TYPE_CONTENT, userOneN1.getId());
// The source node has no content // The source node has no content
request = new ArrayList<>(2);
request.add(new Rendition().setId("doclib"));
post(getNodeRenditionsUrl(emptyContentNodeId), userOneN1.getId(), toJsonAsString(renditionRequest), 400); post(getNodeRenditionsUrl(emptyContentNodeId), userOneN1.getId(), toJsonAsString(renditionRequest), 400);
String content = "The quick brown fox jumps over the lazy dog."; String content = "The quick brown fox jumps over the lazy dog.";
@@ -465,14 +467,14 @@ public class RenditionsTest extends AbstractBaseApiTest
String folderName = "folder" + System.currentTimeMillis(); String folderName = "folder" + System.currentTimeMillis();
String folder_Id = addToDocumentLibrary(userOneN1Site, folderName, ContentModel.TYPE_FOLDER, userId); String folder_Id = addToDocumentLibrary(userOneN1Site, folderName, ContentModel.TYPE_FOLDER, userId);
// Create multipart request // Create multipart request - pdf file
String renditionName = "doclib"; String renditionName = "doclib";
String fileName = "quick.pdf"; String fileName = "quick.pdf";
File file = getResourceFile(fileName); File file = getResourceFile(fileName);
MultiPartBuilder multiPartBuilder = MultiPartBuilder.create() MultiPartRequest reqBody = MultiPartBuilder.create()
.setFileData(new FileData(fileName, file, MimetypeMap.MIMETYPE_PDF)) .setFileData(new FileData(fileName, file, MimetypeMap.MIMETYPE_PDF))
.setRenditions(Collections.singletonList(renditionName)); .setRenditions(Collections.singletonList(renditionName))
MultiPartRequest reqBody = multiPartBuilder.build(); .build();
// Upload quick.pdf file into 'folder' - including request to create 'doclib' thumbnail // Upload quick.pdf file into 'folder' - including request to create 'doclib' thumbnail
HttpResponse response = post(getNodeChildrenUrl(folder_Id), userId, reqBody.getBody(), null, reqBody.getContentType(), 201); HttpResponse response = post(getNodeChildrenUrl(folder_Id), userId, reqBody.getBody(), null, reqBody.getContentType(), 201);
@@ -484,12 +486,31 @@ public class RenditionsTest extends AbstractBaseApiTest
assertNotNull(rendition); assertNotNull(rendition);
assertEquals(RenditionStatus.CREATED, rendition.getStatus()); assertEquals(RenditionStatus.CREATED, rendition.getStatus());
// Create multipart request - Word doc file
renditionName = "doclib";
fileName = "CAP-v1.2-os.doc";
file = getResourceFile(fileName);
reqBody = MultiPartBuilder.create()
.setFileData(new FileData(fileName, file, MimetypeMap.MIMETYPE_WORD))
.setRenditions(Collections.singletonList(renditionName))
.build();
// Upload quick.txt file into 'folder' - including request to create 'doclib' thumbnail
response = post(getNodeChildrenUrl(folder_Id), userId, reqBody.getBody(), null, reqBody.getContentType(), 201);
document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
contentNodeId = document.getId();
// wait and check that rendition is created ...
rendition = waitAndGetRendition(userId, contentNodeId, renditionName);
assertNotNull(rendition);
assertEquals(RenditionStatus.CREATED, rendition.getStatus());
/* /*
// TODO open question // TODO open question (RA-834)
// - should we accept for JSON when creating empty file (ie. with zero-byte content) // - should we accept for JSON when creating empty file (ie. with zero-byte content)
// - eg. might fail, eg. doclib for empty plain text / pdf ? // - eg. might fail, eg. doclib for empty plain text / pdf ?
Document d1 = new Document(); Document d1 = new Document();
d1.setName("d1.pdf"); d1.setName("d1.txt");
d1.setNodeType("cm:content"); d1.setNodeType("cm:content");
ContentInfo ci = new ContentInfo(); ContentInfo ci = new ContentInfo();
ci.setMimeType(MimetypeMap.MIMETYPE_TEXT_PLAIN); ci.setMimeType(MimetypeMap.MIMETYPE_TEXT_PLAIN);