From bab77b5235fceaf6a3bcffdc210e2054fbe8ab3c Mon Sep 17 00:00:00 2001 From: Ancuta Morarasu Date: Wed, 11 May 2016 11:45:28 +0000 Subject: [PATCH] Merged HEAD (5.2) to 5.2.N (5.2.1) 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 --- .../org/alfresco/rest/api/tests/SharedLinkApiTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/test-java/org/alfresco/rest/api/tests/SharedLinkApiTest.java b/source/test-java/org/alfresco/rest/api/tests/SharedLinkApiTest.java index 148d427e55..1d7ea16eb9 100644 --- a/source/test-java/org/alfresco/rest/api/tests/SharedLinkApiTest.java +++ b/source/test-java/org/alfresco/rest/api/tests/SharedLinkApiTest.java @@ -273,8 +273,8 @@ public class SharedLinkApiTest extends AbstractBaseApiTest response = getSingle(NodesEntityResource.class, user2, d1Id, null, 200); nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class); - //assertEquals(docModifiedAt.getTime(), nodeResp.getModifiedAt().getTime()); // not changed - //assertEquals(docModifiedBy, nodeResp.getModifiedByUser().getId()); // not changed (ie. not user2) + assertEquals(docModifiedAt.getTime(), nodeResp.getModifiedAt().getTime()); // not changed + assertEquals(docModifiedBy, nodeResp.getModifiedByUser().getId()); // not changed (ie. not user2) // -ve create tests