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 
129184 mmuller: Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
      128681 jvonka: V1 REST API: version history - add api sanity check for auto-version on metadata-only updates
      REPO-348, REPO-313, REPO-905


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129358 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alexandru Epure
2016-08-09 14:15:11 +00:00
parent 9cba5fc5b5
commit dbf2ae6c03
5 changed files with 153 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,12 +86,13 @@ public class DeletedNodesTest extends AbstractSingleNetworkSiteTest
String folder1 = "folder-testCreateAndDelete-" + now.getTime() + "_1";
Folder createdFolder = createFolder(tDocLibNodeId, folder1, null);
assertNotNull(createdFolder);
String f1Id = createdFolder.getId();
//Create a folder outside a site
Folder createdFolderNonSite = createFolder(Nodes.PATH_MY, folder1, null);
assertNotNull(createdFolderNonSite);
Document document = createEmptyTextFile(createdFolder, "d1.txt");
Document document = createEmptyTextFile(f1Id, "d1.txt");
PublicApiClient.Paging paging = getPaging(0, 100);
@@ -176,16 +177,17 @@ public class DeletedNodesTest extends AbstractSingleNetworkSiteTest
String folder1 = "folder" + now.getTime() + "_1";
Folder createdFolder = createFolder(tDocLibNodeId, folder1, null);
assertNotNull(createdFolder);
String f1Id = createdFolder.getId();
//Create a folder outside a site
Folder createdFolderNonSite = createFolder(Nodes.PATH_MY, folder1, null);
assertNotNull(createdFolderNonSite);
Document document = createEmptyTextFile(createdFolder, "restoreme.txt");
Document document = createEmptyTextFile(f1Id, "restoreme.txt");
deleteNode(document.getId());
//Create another document with the same name
Document documentSameName = createEmptyTextFile(createdFolder, "restoreme.txt");
Document documentSameName = createEmptyTextFile(f1Id, "restoreme.txt");
//Can't restore a node of the same name
post(URL_DELETED_NODES+"/"+document.getId()+"/restore", null, null, Status.STATUS_CONFLICT);