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 
127612 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127450 jvonka: Node Associations - creating/listing primary child assoc type other than cm:contains
      - fix test fallout (400 -> 422 for model integrity exceptions)
      - RA-1092


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127719 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-03 15:18:58 +00:00
parent f99ba16ec7
commit c96fec3100
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java
View File

@@ -1744,11 +1744,11 @@ public class NodeApiTest extends AbstractBaseApiTest
Document documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
String d1Id = documentResp.getId();
// -ve test - invalid (eg. not a folder) parent id
// -ve test - invalid (model integrity exception)
Folder f3 = new Folder();
f3.setName("f3");
f3.setNodeType(TYPE_CM_FOLDER);
post(getNodeChildrenUrl(d1Id), user1, toJsonAsStringNonNull(f3), 400);
post(getNodeChildrenUrl(d1Id), user1, toJsonAsStringNonNull(f3), 422);
// -ve test - it should not be possible to create a "system folder"
invalid = new Folder();
@@ -2379,11 +2379,11 @@ public class NodeApiTest extends AbstractBaseApiTest
invalid.setName("my file.txt");
post(postUrl, user1, toJsonAsStringNonNull(invalid), 400);
// -ve test - invalid (eg. not a folder) parent id
// -ve test - invalid (model integrity exception)
Document d3 = new Document();
d3.setName("d3.txt");
d3.setNodeType(TYPE_CM_CONTENT);
post(getNodeChildrenUrl(d1Id), user1, toJsonAsStringNonNull(d3), 400);
post(getNodeChildrenUrl(d1Id), user1, toJsonAsStringNonNull(d3), 422);
// -ve test - unknown parent folder node id
post(getNodeChildrenUrl(UUID.randomUUID().toString()), user1, toJsonAsStringNonNull(d3), 404);