From 4f47d68c8b5782ab710989974782bcfc0028453d Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Thu, 3 Nov 2016 13:11:42 +0000 Subject: [PATCH] Merged 5.2.N (5.2.1) to HEAD (5.2) 130556 cmocanu: Added new negative test for Lock functionality: try to lock a folder. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132145 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/rest/api/tests/NodeApiTest.java | 15 +++++++++++---- 1 file changed, 11 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 91642c8255..804fa71009 100644 --- a/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java +++ b/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java @@ -3594,13 +3594,20 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest // create folder Folder folderResp = createFolder(Nodes.PATH_MY, "folder" + RUNID); String folderId = folderResp.getId(); - + + // try to lock the folder and check that is not allowed + LockInfo lockInfo = new LockInfo(); + lockInfo.setTimeToExpire(60); + lockInfo.setType("FULL"); + lockInfo.setLifetime("PERSISTENT"); + HttpResponse response = post(getNodeOperationUrl(folderId, "lock"), toJsonAsStringNonNull(lockInfo), null, 400); + // create doc d1 String d1Name = "content" + RUNID + "_1l"; Document d1 = createTextFile(folderId, d1Name, "The quick brown fox jumps over the lazy dog 1."); String d1Id = d1.getId(); - HttpResponse response = getSingle(URL_NODES, d1Id, null, null, 200); + response = getSingle(URL_NODES, d1Id, null, null, 200); Node node = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class); assertNull(node.getProperties().get("cm:lockType")); assertNull(node.getProperties().get("cm:lockOwner")); @@ -3613,7 +3620,7 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest assertNull(node.getProperties().get("cm:lockOwner")); assertFalse(node.getIsLocked()); - LockInfo lockInfo = new LockInfo(); + lockInfo = new LockInfo(); lockInfo.setTimeToExpire(60); lockInfo.setType("FULL"); lockInfo.setLifetime("PERSISTENT"); @@ -3774,7 +3781,7 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest // create folder Folder folderResp = createFolder(Nodes.PATH_MY, "folder" + RUNID); String folderId = folderResp.getId(); - + // create doc d1 String d1Name = "content" + RUNID + "_1l"; Document d1 = createTextFile(folderId, d1Name, "The quick brown fox jumps over the lazy dog 1.");