From d0f3990dcc97ba4a90aea86b7fb61f7ca816984f Mon Sep 17 00:00:00 2001 From: Alexandru Epure Date: Tue, 9 Aug 2016 14:14:52 +0000 Subject: [PATCH] Merged 5.2.N (5.2.1) to HEAD (5.2) 129182 mmuller: Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1) 128651 jvonka: V1 REST API test improvements: minor fix to re-comment out known issue (see REPO-907) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129356 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/rest/api/tests/NodeApiTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java b/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java index 0ba0bf1537..14ef36d352 100644 --- a/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java +++ b/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java @@ -1446,12 +1446,12 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest Node nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class); assertEquals(user2, ((Map)nodeResp.getProperties().get(PROP_OWNER)).get("id")); - // TODO apparently returns 204 here in tenant context ?? (eg. if useDefaultNetwork=false) - //if (useDefaultNetwork) - //{ + // TODO see REPO-907. Apparently returns 204 here in tenant context ?? (eg. if useDefaultNetwork=false) + if (useDefaultNetwork) + { // -ve test - user1 can no longer delete deleteNode(folder5Id, 403); - //} + } // TODO refactor with remote permission api calls (maybe use v0 until we have v1 ?) final String tenantDomain = (networkOne != null ? networkOne.getId() : TenantService.DEFAULT_DOMAIN);