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 HEAD (5.2) to 5.2.N (5.2.1)

Browse Source 
126499 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122722 jvonka: (Quick) Shared Links API - update shared links api test for delete
      - extra test for ensuring that modified/modifier (=> modifiedAt, modifiedByUser) did not change due to delete (after merging MNT-15654)
      RA-708, RA-776


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126843 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 11:45:28 +00:00
parent b157388816
commit bab77b5235
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/test-java/org/alfresco/rest/api/tests/SharedLinkApiTest.java
View File

@@ -273,8 +273,8 @@ public class SharedLinkApiTest extends AbstractBaseApiTest
response = getSingle(NodesEntityResource.class, user2, d1Id, null, 200); response = getSingle(NodesEntityResource.class, user2, d1Id, null, 200);
nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class); nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
//assertEquals(docModifiedAt.getTime(), nodeResp.getModifiedAt().getTime()); // not changed assertEquals(docModifiedAt.getTime(), nodeResp.getModifiedAt().getTime()); // not changed
//assertEquals(docModifiedBy, nodeResp.getModifiedByUser().getId()); // not changed (ie. not user2) assertEquals(docModifiedBy, nodeResp.getModifiedByUser().getId()); // not changed (ie. not user2)
// -ve create tests // -ve create tests