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 
129171 mmuller: Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
      128537 jvonka: V1 REST API: Api Test cleanup and rationalisation (re: helper methods / runAs user / admin) - round 1
      REPO-113


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129345 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alexandru Epure
2016-08-09 14:13:11 +00:00
parent b3eda064b3
commit e44796d1ec
10 changed files with 639 additions and 749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,14 +75,15 @@ public class DeletedNodesTest extends AbstractSingleNetworkSiteTest
@Test
public void testCreateAndDelete() throws Exception
{
publicApiClient.setRequestContext(new RequestContext(u1.getId()));
setRequestContext(u1.getId());
Date now = new Date();
String folder1 = "folder" + now.getTime() + "_1";
Folder createdFolder = createFolder(u1.getId(), docLibNodeRef.getId(), folder1, null);
Folder createdFolder = createFolder(docLibNodeRef.getId(), folder1, null);
assertNotNull(createdFolder);
//Create a folder outside a site
Folder createdFolderNonSite = createFolder(u1.getId(), Nodes.PATH_MY, folder1, null);
Folder createdFolderNonSite = createFolder(Nodes.PATH_MY, folder1, null);
assertNotNull(createdFolderNonSite);
Document document = createDocument(createdFolder, "d1.txt");
@@ -160,14 +161,15 @@ public class DeletedNodesTest extends AbstractSingleNetworkSiteTest
@Test
public void testCreateAndRestore() throws Exception
{
publicApiClient.setRequestContext(new RequestContext(u1.getId()));
setRequestContext(u1.getId());
Date now = new Date();
String folder1 = "folder" + now.getTime() + "_1";
Folder createdFolder = createFolder(u1.getId(), docLibNodeRef.getId(), folder1, null);
Folder createdFolder = createFolder(docLibNodeRef.getId(), folder1, null);
assertNotNull(createdFolder);
//Create a folder outside a site
Folder createdFolderNonSite = createFolder(u1.getId(), Nodes.PATH_MY, folder1, null);
Folder createdFolderNonSite = createFolder(Nodes.PATH_MY, folder1, null);
assertNotNull(createdFolderNonSite);
Document document = createDocument(createdFolder, "restoreme.txt");
@@ -204,10 +206,11 @@ public class DeletedNodesTest extends AbstractSingleNetworkSiteTest
@Test
public void testCreateAndPurge() throws Exception
{
publicApiClient.setRequestContext(new RequestContext(u1.getId()));
setRequestContext(u1.getId());
Date now = new Date();
String folder1 = "folder" + now.getTime() + "_1";
Folder createdFolder = createFolder(u1.getId(), docLibNodeRef.getId(), folder1, null);
Folder createdFolder = createFolder(docLibNodeRef.getId(), folder1, null);
assertNotNull(createdFolder);
delete(URL_NODES, u1.getId(), createdFolder.getId(), 204);