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

126635 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      126115 jvonka: RA-1028: Fix copy bug - if same parent & name (ie. nothing copied) then return 409 rather than 201
      - see also SFS-554


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126986 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 12:41:31 +00:00
parent 9a98f13348
commit 4383e6017b
2 changed files with 13 additions and 2 deletions

View File

@@ -1476,12 +1476,17 @@ public class NodeApiTest extends AbstractBaseApiTest
tgt.setName("new name");
post("nodes/"+d1Id+"/copy", user1, toJsonAsStringNonNull(tgt), null, 400);
// name already exists
// name already exists - different parent
tgt = new NodeTarget();
tgt.setName(newD2Name);
tgt.setTargetParentId(targetId);
post("nodes/"+d1Id+"/copy", user1, toJsonAsStringNonNull(tgt), null, 409);
// name already exists - same parent
tgt = new NodeTarget();
tgt.setTargetParentId(sourceId);
post("nodes/"+d1Id+"/copy", user1, toJsonAsStringNonNull(tgt), null, 409);
// unknown source nodeId
tgt = new NodeTarget();
tgt.setTargetParentId(targetId);