inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
129176 mmuller: Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
      128601 jvonka: V1 REST API: cleanup and rationalise new api tests (re: remotable helpers & runAs user / admin) - round 3
      REPO-113 (also relates to REPO-28, REPO-825)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129350 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alexandru Epure
2016-08-09 14:13:57 +00:00
parent 4498ab0a4a
commit 5cba40f420
8 changed files with 263 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
source/test-java/org/alfresco/rest/DeletedNodesTest.java
View File

@@ -31,15 +31,14 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import org.alfresco.rest.api.Nodes;
import org.alfresco.rest.api.tests.RepoService;
import org.alfresco.rest.api.tests.client.HttpResponse;
import org.alfresco.rest.api.tests.client.PublicApiClient;
import org.alfresco.rest.api.tests.client.RequestContext;
import org.alfresco.rest.api.tests.client.data.Document;
import org.alfresco.rest.api.tests.client.data.Folder;
import org.alfresco.rest.api.tests.client.data.Node;
import org.alfresco.rest.api.tests.client.data.PathInfo;
import org.alfresco.rest.api.tests.util.RestApiUtil;
import org.junit.After;
import org.junit.Test;
import org.springframework.extensions.webscripts.Status;
@@ -57,15 +56,19 @@ public class DeletedNodesTest extends AbstractSingleNetworkSiteTest
{
protected static final String URL_DELETED_NODES = "deleted-nodes";
private RepoService.TestPerson u2;
@Override
public void setup() throws Exception
{
super.setup();
u2 = networkOne.createUser();
}
@After
public void tearDown() throws Exception
{
super.tearDown();
}
/**
* Tests getting deleted nodes
* <p>GET:</p>
@@ -75,7 +78,7 @@ public class DeletedNodesTest extends AbstractSingleNetworkSiteTest
@Test
public void testCreateAndDelete() throws Exception
{
setRequestContext(u1.getId());
setRequestContext(user1);
Date now = new Date();
String folder1 = "folder" + now.getTime() + "_1";
@@ -86,11 +89,11 @@ public class DeletedNodesTest extends AbstractSingleNetworkSiteTest
Folder createdFolderNonSite = createFolder(Nodes.PATH_MY, folder1, null);
assertNotNull(createdFolderNonSite);
Document document = createDocument(createdFolder, "d1.txt");
Document document = createEmptyTextFile(createdFolder, "d1.txt");
PublicApiClient.Paging paging = getPaging(0, 5);
//First get any deleted nodes
HttpResponse response = getAll(URL_DELETED_NODES, u1.getId(), paging, 200);
HttpResponse response = getAll(URL_DELETED_NODES, user1, paging, 200);
List<Node> nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
assertNotNull(nodes);
int numOfNodes = nodes.size();
@@ -99,25 +102,25 @@ public class DeletedNodesTest extends AbstractSingleNetworkSiteTest
deleteNode(createdFolder.getId());
deleteNode(createdFolderNonSite.getId());
response = getAll(URL_DELETED_NODES, u1.getId(), paging, 200);
response = getAll(URL_DELETED_NODES, user1, paging, 200);
nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
assertNotNull(nodes);
assertEquals(numOfNodes+3,nodes.size());
Map<String, String> params = Collections.singletonMap("include", "path");
response = getSingle(URL_DELETED_NODES, u1.getId(), document.getId(), params, 200);
response = getSingle(URL_DELETED_NODES, user1, document.getId(), params, 200);
Document node = jacksonUtil.parseEntry(response.getJsonResponse(), Document.class);
assertNotNull(node);
assertEquals(u1.getId(), node.getArchivedByUser().getId());
assertEquals(user1, node.getArchivedByUser().getId());
assertTrue(node.getArchivedAt().after(now));
PathInfo path = node.getPath();
assertNull("Path should be null because its parent has been deleted",path);
assertNull("We don't show the parent id for a deleted node",node.getParentId());
response = getSingle(URL_DELETED_NODES, u1.getId(), createdFolder.getId(), params, 200);
response = getSingle(URL_DELETED_NODES, user1, createdFolder.getId(), params, 200);
Folder fNode = jacksonUtil.parseEntry(response.getJsonResponse(), Folder.class);
assertNotNull(fNode);
assertEquals(u1.getId(), fNode.getArchivedByUser().getId());
assertEquals(user1, fNode.getArchivedByUser().getId());
assertTrue(fNode.getArchivedAt().after(now));
path = fNode.getPath();
assertNotNull(path);
@@ -125,27 +128,27 @@ public class DeletedNodesTest extends AbstractSingleNetworkSiteTest
assertTrue(path.getIsComplete());
assertNull("We don't show the parent id for a deleted node",fNode.getParentId());
response = getSingle(URL_DELETED_NODES, u1.getId(), createdFolderNonSite.getId(), params, 200);
response = getSingle(URL_DELETED_NODES, user1, createdFolderNonSite.getId(), params, 200);
fNode = jacksonUtil.parseEntry(response.getJsonResponse(), Folder.class);
assertNotNull(fNode);
assertEquals(u1.getId(), fNode.getArchivedByUser().getId());
assertEquals(user1, fNode.getArchivedByUser().getId());
assertTrue(fNode.getArchivedAt().after(now));
path = fNode.getPath();
assertNotNull(path);
assertEquals("/Company Home/User Homes/"+u1.getId(), path.getName());
assertEquals("/Company Home/User Homes/"+user1, path.getName());
assertTrue(path.getIsComplete());
//The list is ordered with the most recently deleted node first
checkDeletedNodes(now, createdFolder, createdFolderNonSite, document, nodes);
//User 2 can't get it but user 1 can.
getSingle(URL_DELETED_NODES, u2.getId(), createdFolderNonSite.getId(), Status.STATUS_FORBIDDEN);
getSingle(URL_DELETED_NODES, user2, createdFolderNonSite.getId(), Status.STATUS_FORBIDDEN);
//Invalid node ref
getSingle(URL_DELETED_NODES, u1.getId(), "iddontexist", 404);
getSingle(URL_DELETED_NODES, user1, "iddontexist", 404);
//Now as admin
publicApiClient.setRequestContext(new RequestContext(networkOne.getId(), "admin@"+networkOne.getId(), "admin"));
setRequestContext("admin");
response = publicApiClient.get(getScope(), URL_DELETED_NODES, null, null, null, createParams(paging, null));
checkStatus(200, response.getStatusCode());
nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
@@ -161,7 +164,7 @@ public class DeletedNodesTest extends AbstractSingleNetworkSiteTest
@Test
public void testCreateAndRestore() throws Exception
{
setRequestContext(u1.getId());
setRequestContext(user1);
Date now = new Date();
String folder1 = "folder" + now.getTime() + "_1";
@@ -172,31 +175,31 @@ public class DeletedNodesTest extends AbstractSingleNetworkSiteTest
Folder createdFolderNonSite = createFolder(Nodes.PATH_MY, folder1, null);
assertNotNull(createdFolderNonSite);
Document document = createDocument(createdFolder, "restoreme.txt");
Document document = createEmptyTextFile(createdFolder, "restoreme.txt");
deleteNode(document.getId());
//Create another document with the same name
Document documentSameName = createDocument(createdFolder, "restoreme.txt");
Document documentSameName = createEmptyTextFile(createdFolder, "restoreme.txt");
//Can't restore a node of the same name
post(URL_DELETED_NODES+"/"+document.getId()+"/restore", u1.getId(), null, null, Status.STATUS_CONFLICT);
post(URL_DELETED_NODES+"/"+document.getId()+"/restore", user1, null, null, Status.STATUS_CONFLICT);
deleteNode(documentSameName.getId());
//Now we can restore it.
post(URL_DELETED_NODES+"/"+document.getId()+"/restore", u1.getId(), null, null, 200);
post(URL_DELETED_NODES+"/"+document.getId()+"/restore", user1, null, null, 200);
deleteNode(createdFolder.getId());
//We deleted the parent folder so lets see if we can restore a child doc, hopefully not.
post(URL_DELETED_NODES+"/"+documentSameName.getId()+"/restore", u1.getId(), null, null, Status.STATUS_NOT_FOUND);
post(URL_DELETED_NODES+"/"+documentSameName.getId()+"/restore", user1, null, null, Status.STATUS_NOT_FOUND);
//Can't delete "nonsense" noderef
post("deleted-nodes/nonsense/restore", u1.getId(), null, null, Status.STATUS_NOT_FOUND);
post("deleted-nodes/nonsense/restore", user1, null, null, Status.STATUS_NOT_FOUND);
//User 2 can't restore it but user 1 can.
post(URL_DELETED_NODES+"/"+createdFolder.getId()+"/restore", u2.getId(), null, null, Status.STATUS_FORBIDDEN);
post(URL_DELETED_NODES+"/"+createdFolder.getId()+"/restore", u1.getId(), null, null, 200);
post(URL_DELETED_NODES+"/"+createdFolder.getId()+"/restore", user2, null, null, Status.STATUS_FORBIDDEN);
post(URL_DELETED_NODES+"/"+createdFolder.getId()+"/restore", user1, null, null, 200);
}
/**
@@ -207,7 +210,7 @@ public class DeletedNodesTest extends AbstractSingleNetworkSiteTest
@Test
public void testCreateAndPurge() throws Exception
{
setRequestContext(u1.getId());
setRequestContext(user1);
Date now = new Date();
String folder1 = "folder" + now.getTime() + "_1";
@@ -216,21 +219,21 @@ public class DeletedNodesTest extends AbstractSingleNetworkSiteTest
deleteNode(createdFolder.getId());
HttpResponse response = getSingle(URL_DELETED_NODES, u1.getId(), createdFolder.getId(), 200);
HttpResponse response = getSingle(URL_DELETED_NODES, user1, createdFolder.getId(), 200);
Folder fNode = jacksonUtil.parseEntry(response.getJsonResponse(), Folder.class);
assertNotNull(fNode);
//try purging "nonsense"
delete(URL_DELETED_NODES, u1.getId(), "nonsense", 404);
delete(URL_DELETED_NODES, user1, "nonsense", 404);
//User 2 can't do it
delete(URL_DELETED_NODES, u2.getId(), createdFolder.getId(), Status.STATUS_FORBIDDEN);
delete(URL_DELETED_NODES, user2, createdFolder.getId(), Status.STATUS_FORBIDDEN);
//Now purge the folder
delete(URL_DELETED_NODES, u1.getId(), createdFolder.getId(), 204);
delete(URL_DELETED_NODES, user1, createdFolder.getId(), 204);
//This time we can't find it.
getSingle(URL_DELETED_NODES, u1.getId(), createdFolder.getId(), 404);
getSingle(URL_DELETED_NODES, user1, createdFolder.getId(), 404);
}
/**
@@ -241,14 +244,14 @@ public class DeletedNodesTest extends AbstractSingleNetworkSiteTest
Node aNode = (Node) nodes.get(0);
assertNotNull(aNode);
assertEquals("This folder was deleted most recently", createdFolderNonSite.getId(), aNode.getId());
assertEquals(u1.getId(), aNode.getArchivedByUser().getId());
assertEquals(user1, aNode.getArchivedByUser().getId());
assertTrue(aNode.getArchivedAt().after(now));
assertNull("We don't show the parent id for a deleted node",aNode.getParentId());
Node folderNode = (Node) nodes.get(1);
assertNotNull(folderNode);
assertEquals(createdFolder.getId(), folderNode.getId());
assertEquals(u1.getId(), folderNode.getArchivedByUser().getId());
assertEquals(user1, folderNode.getArchivedByUser().getId());
assertTrue(folderNode.getArchivedAt().after(now));
assertTrue("This folder was deleted before the non-site folder", folderNode.getArchivedAt().before(aNode.getArchivedAt()));
assertNull("We don't show the parent id for a deleted node",folderNode.getParentId());
@@ -256,7 +259,7 @@ public class DeletedNodesTest extends AbstractSingleNetworkSiteTest
aNode = (Node) nodes.get(2);
assertNotNull(aNode);
assertEquals(document.getId(), aNode.getId());
assertEquals(u1.getId(), aNode.getArchivedByUser().getId());
assertEquals(user1, aNode.getArchivedByUser().getId());
assertTrue(aNode.getArchivedAt().after(now));
assertNull("We don't show the parent id for a deleted node",aNode.getParentId());
}