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

127607 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127420 jvonka: Node Associations - 1st cut for creating/listing primary child assoc type other than cm:contains
      - minor: fix test fallout
      RA-1092


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127714 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-03 15:18:29 +00:00
parent 22d91cb857
commit 18a8b2949e

View File

@@ -527,9 +527,6 @@ public class NodeApiTest extends AbstractBaseApiTest
paging = getPaging(0, 10); paging = getPaging(0, 10);
// -ve test - list folder children for non-folder node should return 400
getAll(getNodeChildrenUrl(content1_Id), user1, paging, 400);
// -ve test - list folder children for unknown node should return 404 // -ve test - list folder children for unknown node should return 404
getAll(getNodeChildrenUrl(UUID.randomUUID().toString()), user1, paging, 404); getAll(getNodeChildrenUrl(UUID.randomUUID().toString()), user1, paging, 404);
@@ -545,11 +542,7 @@ public class NodeApiTest extends AbstractBaseApiTest
params = Collections.singletonMap(Nodes.PARAM_RELATIVE_PATH, "User Homes/" + user2); params = Collections.singletonMap(Nodes.PARAM_RELATIVE_PATH, "User Homes/" + user2);
getAll(rootChildrenUrl, user1, paging, params, 404); getAll(rootChildrenUrl, user1, paging, params, 404);
// -ve test - try to list children using relative path to node that is of wrong type (ie. not a folder/container) // -ve test - list folder children with relative path to unknown node should return 400
params = Collections.singletonMap(Nodes.PARAM_RELATIVE_PATH, folder1 + "/" + contentF1);
getAll(myChildrenUrl, user1, paging, params, 400);
// -ve test - list folder children for non-folder node with relative path should return 400
params = Collections.singletonMap(Nodes.PARAM_RELATIVE_PATH, "/unknown"); params = Collections.singletonMap(Nodes.PARAM_RELATIVE_PATH, "/unknown");
getAll(getNodeChildrenUrl(content1_Id), user1, paging, params, 400); getAll(getNodeChildrenUrl(content1_Id), user1, paging, params, 400);
} }