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 HEAD (5.2) to 5.2.N (5.2.1)

Browse Source 
128106 jvonka: Merged RETURN-OF-THE-API (5.2.0) to HEAD (5.2)
      128071: REPO-495: Update + add tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128127 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrei Rebegea
2016-06-10 13:49:18 +00:00
parent 6eb4077978
commit a1facc20f9
8 changed files with 205 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/test-java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java
View File

@@ -536,7 +536,7 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi
File txtFile = TempFileProvider.createTempFile(inputStream, getClass().getSimpleName(), ".txt");
MultiPartBuilder.MultiPartRequest reqBody = MultiPartBuilder.create()
.setFileData(new MultiPartBuilder.FileData(fileName, txtFile, MimetypeMap.MIMETYPE_TEXT_PLAIN, encoding))
.setFileData(new MultiPartBuilder.FileData(fileName, txtFile))
.setProperties(props)
.build();
@@ -554,7 +554,7 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi
{
ByteArrayInputStream inputStream = new ByteArrayInputStream(textContent.getBytes());
File txtFile = TempFileProvider.createTempFile(inputStream, getClass().getSimpleName(), ".txt");
BinaryPayload payload = new BinaryPayload(txtFile, MimetypeMap.MIMETYPE_TEXT_PLAIN);
BinaryPayload payload = new BinaryPayload(txtFile);
HttpResponse response = putBinary(getNodeContentUrl(contentId), userId, payload, null, parameters, 200);
return RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);