From acd1ae2facd40a58aa98ad14ea63d9f5fe08a1d1 Mon Sep 17 00:00:00 2001 From: Matt Ward Date: Thu, 16 Nov 2017 11:41:36 +0000 Subject: [PATCH] REPO-2983: allowableOperationsOnTarget (shared links) - extra tests Added some extra assertions so that allowableOperationsOnTarget follows the same "include" behaviour as for allowableOperations. --- .../rest/api/tests/SharedLinkApiTest.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/test/java/org/alfresco/rest/api/tests/SharedLinkApiTest.java b/src/test/java/org/alfresco/rest/api/tests/SharedLinkApiTest.java index 28429b07c3..9f33789e84 100644 --- a/src/test/java/org/alfresco/rest/api/tests/SharedLinkApiTest.java +++ b/src/test/java/org/alfresco/rest/api/tests/SharedLinkApiTest.java @@ -225,6 +225,7 @@ public class SharedLinkApiTest extends AbstractBaseApiTest assertEquals(fileName1, resp.getName()); assertEquals(d1Id, resp.getNodeId()); assertNull(resp.getAllowableOperations()); // include is ignored + assertNull(resp.getAllowableOperationsOnTarget()); // include is ignored assertNull(resp.getModifiedByUser().getId()); // userId not returned assertEquals(UserInfo.getTestDisplayName(user1), resp.getModifiedByUser().getDisplayName()); @@ -240,6 +241,8 @@ public class SharedLinkApiTest extends AbstractBaseApiTest assertEquals(fileName1, resp.getName()); assertEquals(d1Id, resp.getNodeId()); assertNull(resp.getAllowableOperations()); // include is ignored + assertNull(resp.getAllowableOperationsOnTarget()); // include is ignored + assertNull(resp.getModifiedByUser().getId()); // userId not returned assertEquals(UserInfo.getTestDisplayName(user1), resp.getModifiedByUser().getDisplayName()); @@ -251,6 +254,7 @@ public class SharedLinkApiTest extends AbstractBaseApiTest response = getSingle(QuickShareLinkEntityResource.class, shared1Id, null, 200); resp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), QuickShareLink.class); assertNull(resp.getAllowableOperations()); + assertNull(resp.getAllowableOperationsOnTarget()); setRequestContext(null); @@ -263,6 +267,8 @@ public class SharedLinkApiTest extends AbstractBaseApiTest assertEquals(fileName1, resp.getName()); assertEquals(d1Id, resp.getNodeId()); assertNull(resp.getAllowableOperations()); // include is ignored + assertNull(resp.getAllowableOperationsOnTarget()); // include is ignored + assertNull(resp.getModifiedByUser().getId()); // userId not returned assertEquals(UserInfo.getTestDisplayName(user1), resp.getModifiedByUser().getDisplayName()); @@ -779,6 +785,8 @@ public class SharedLinkApiTest extends AbstractBaseApiTest assertEquals(fileName1, resp.getName()); assertEquals(d1Id, resp.getNodeId()); assertNull(resp.getAllowableOperations()); // include is ignored + assertNull(resp.getAllowableOperationsOnTarget()); // include is ignored + // unauth access to file 1 content (via shared link) response = getSingle(QuickShareLinkEntityResource.class, shared1Id + "/content", null, 200); @@ -1254,7 +1262,7 @@ public class SharedLinkApiTest extends AbstractBaseApiTest // Check allowableOperationsOnTarget (i.e. for the actual file being shared) allowableOperations = quickShareLinkResponse.getAllowableOperationsOnTarget(); assertNotNull("'allowableOperationsOnTarget' should have been returned.", allowableOperations); - Collection expectedOps = Arrays.asList("delete", "update", "updatePermissions"); + Collection expectedOps = Arrays.asList("delete", "update", "updatePermissions"); assertTrue(allowableOperations.containsAll(expectedOps)); assertEquals(expectedOps.size(), allowableOperations.size()); assertEquals("Incorrect allowable operation.", "delete", allowableOperations.get(0)); @@ -1278,6 +1286,13 @@ public class SharedLinkApiTest extends AbstractBaseApiTest assertNotNull("'allowableOperations' should have been returned.", operations); assertEquals("allowableOperations should only have 'Delete' as allowable operation.", 1, operations.size()); assertEquals("Incorrect allowable operation.", "delete", operations.get(0)); + + // Check allowableOperationsOnTarget (i.e. for the actual file being shared) + operations = sharedLink.getAllowableOperationsOnTarget(); + assertNotNull("'allowableOperationsOnTarget' should have been returned.", operations); + assertTrue(operations.containsAll(expectedOps)); + assertEquals(expectedOps.size(), operations.size()); + assertEquals("Incorrect allowable operation.", "delete", operations.get(0)); }); }