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/BRANCHES/DEV/5.2.N/root@129171 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Martin Muller
2016-08-05 13:47:03 +00:00
parent 6d4716b5c0
commit ebeb96f576
10 changed files with 639 additions and 749 deletions

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);