Merged HEAD (5.2) to 5.2.N (5.2.1)

126510 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122805 jkaabimofrad: Fixed test failure .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126854 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 11:47:42 +00:00
parent 5fe5afaf0b
commit 53d06c6ff8

View File

@@ -556,11 +556,6 @@ public class RenditionsTest extends AbstractBaseApiTest
response = post("nodes/" + folder_Id + "/children", userOneN1.getId(), reqBody.getBody(), null, reqBody.getContentType(), 201);
document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
contentNodeId = document.getId();
// Check there is no rendition created yet
response = getSingle(getRenditionsUrl(contentNodeId), userOneN1.getId(), "doclib", 200);
rendition = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Rendition.class);
assertNotNull(rendition);
assertEquals(RenditionStatus.NOT_CREATED, rendition.getStatus());
// The content of the rendition does not exist and the placeholder parameter is not present
getSingle(getRenditionsUrl(contentNodeId), userOneN1.getId(), "doclib/content", 404);