From c96fec3100a763e2a5dfa7118f36d0edb5356545 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Fri, 3 Jun 2016 15:18:58 +0000 Subject: [PATCH] Merged HEAD (5.2) to 5.2.N (5.2.1) 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 --- .../org/alfresco/rest/api/tests/NodeApiTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java b/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java index 213b592d3c..eccd3882d5 100644 --- a/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java +++ b/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java @@ -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);