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

129125 mmuller: Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
      128122 jvonka: v1 REST API:  minor bug fix(es) to update http error code mappings (to 4xx rather than 500) + sanity api tests
      REPO-475, REPO-512, REPO-516, REPO-473


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129319 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alexandru Epure
2016-08-09 14:09:16 +00:00
parent 3a81d7d288
commit 98485e7723
5 changed files with 63 additions and 8 deletions

View File

@@ -1908,6 +1908,15 @@ public class NodeApiTest extends AbstractBaseApiTest
n.setNodeType(TYPE_CM_FOLDER);
n.setRelativePath("d1.txt");
post(getNodeChildrenUrl(myNodeId), user1, RestApiUtil.toJsonAsStringNonNull(n), 409);
// -ve test - minor: error code if trying to create with property with invalid format (REPO-473)
props = new HashMap<>();
props.put("exif:pixelYDimension", "my unknown property");
n = new Folder();
n.setName("fZ");
n.setNodeType(TYPE_CM_FOLDER);
n.setProperties(props);
post(getNodeChildrenUrl(myNodeId), user1, RestApiUtil.toJsonAsStringNonNull(n), 400);
}
/**
@@ -2736,6 +2745,13 @@ public class NodeApiTest extends AbstractBaseApiTest
fUpdate = new Folder();
fUpdate.setParentId(myNodeId);
put(URL_NODES, user1, fId, toJsonAsStringNonNull(fUpdate), null, 200);
// -ve test - minor: error code if trying to update property with invalid format (REPO-473)
props = new HashMap<>();
props.put("exif:pixelYDimension", "my unknown property");
fUpdate = new Folder();
fUpdate.setProperties(props);
put(URL_NODES, user1, f2Id, toJsonAsStringNonNull(fUpdate), null, 400);
}
/**
@@ -2962,6 +2978,10 @@ public class NodeApiTest extends AbstractBaseApiTest
// -ve - try to update content using multi-part form data
payload = new BinaryPayload(txtFile, "multipart/form-data", null);
putBinary(url, user1, payload, null, null, 415);
// -ve - try to invalid media type argument (when parsing request)
payload = new BinaryPayload(txtFile, "/jpeg", null);
putBinary(url, user1, payload, null, null, 415);
}
/**