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
This commit is contained in:
Alan Davis
2016-11-03 13:11:42 +00:00
parent d1350aecb8
commit 4f47d68c8b

View File

@@ -3595,12 +3595,19 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest
Folder folderResp = createFolder(Nodes.PATH_MY, "folder" + RUNID); Folder folderResp = createFolder(Nodes.PATH_MY, "folder" + RUNID);
String folderId = folderResp.getId(); 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 // create doc d1
String d1Name = "content" + RUNID + "_1l"; String d1Name = "content" + RUNID + "_1l";
Document d1 = createTextFile(folderId, d1Name, "The quick brown fox jumps over the lazy dog 1."); Document d1 = createTextFile(folderId, d1Name, "The quick brown fox jumps over the lazy dog 1.");
String d1Id = d1.getId(); 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); Node node = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
assertNull(node.getProperties().get("cm:lockType")); assertNull(node.getProperties().get("cm:lockType"));
assertNull(node.getProperties().get("cm:lockOwner")); assertNull(node.getProperties().get("cm:lockOwner"));
@@ -3613,7 +3620,7 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest
assertNull(node.getProperties().get("cm:lockOwner")); assertNull(node.getProperties().get("cm:lockOwner"));
assertFalse(node.getIsLocked()); assertFalse(node.getIsLocked());
LockInfo lockInfo = new LockInfo(); lockInfo = new LockInfo();
lockInfo.setTimeToExpire(60); lockInfo.setTimeToExpire(60);
lockInfo.setType("FULL"); lockInfo.setType("FULL");
lockInfo.setLifetime("PERSISTENT"); lockInfo.setLifetime("PERSISTENT");