inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +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

7
source/test-java/org/alfresco/rest/api/tests/ActivitiesPostingTest.java
View File

@@ -69,9 +69,10 @@ public class ActivitiesPostingTest extends AbstractSingleNetworkSiteTest
String folder1 = "folder" + System.currentTimeMillis() + "_1";
Folder createdFolder = createFolder(tDocLibNodeId, folder1, null);
assertNotNull(createdFolder);
String f1Id = createdFolder.getId();
String docName = "d1.txt";
Document documentResp = createEmptyTextFile(createdFolder, docName);
Document documentResp = createEmptyTextFile(f1Id, docName);
//Update the file
Document dUpdate = new Document();
@@ -141,12 +142,14 @@ public class ActivitiesPostingTest extends AbstractSingleNetworkSiteTest
List<Activity> activities = getMyActivities();
String folder1 = "nonSitefolder" + System.currentTimeMillis() + "_1";
//Create a folder outside a site
Folder createdFolder = createFolder(Nodes.PATH_MY, folder1, null);
assertNotNull(createdFolder);
String f1Id = createdFolder.getId();
String docName = "nonsite_d1.txt";
Document documentResp = createEmptyTextFile(createdFolder, docName);
Document documentResp = createEmptyTextFile(f1Id, docName);
assertNotNull(documentResp);
//Update the file