diff --git a/source/test-java/org/alfresco/rest/api/tests/TestSiteMembers.java b/source/test-java/org/alfresco/rest/api/tests/TestSiteMembers.java index 99f1cd0531..d191403f3e 100644 --- a/source/test-java/org/alfresco/rest/api/tests/TestSiteMembers.java +++ b/source/test-java/org/alfresco/rest/api/tests/TestSiteMembers.java @@ -16,17 +16,21 @@ import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork; import org.alfresco.rest.api.tests.RepoService.TestNetwork; import org.alfresco.rest.api.tests.RepoService.TestPerson; import org.alfresco.rest.api.tests.RepoService.TestSite; +import org.alfresco.rest.api.tests.client.HttpResponse; import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse; import org.alfresco.rest.api.tests.client.PublicApiClient.Paging; import org.alfresco.rest.api.tests.client.PublicApiClient.Sites; import org.alfresco.rest.api.tests.client.PublicApiException; import org.alfresco.rest.api.tests.client.RequestContext; import org.alfresco.rest.api.tests.client.data.Person; +import org.alfresco.rest.api.tests.client.data.Site; +import org.alfresco.rest.api.tests.client.data.SiteImpl; import org.alfresco.rest.api.tests.client.data.SiteMember; import org.alfresco.rest.api.tests.client.data.SiteRole; import org.alfresco.service.cmr.site.SiteVisibility; import org.alfresco.util.GUID; import org.apache.commons.httpclient.HttpStatus; +import org.json.simple.JSONObject; import org.junit.Test; public class TestSiteMembers extends EnterpriseTestApi @@ -88,6 +92,14 @@ public class TestSiteMembers extends EnterpriseTestApi publicApiClient.setRequestContext(new RequestContext(testNetwork.getId(), personId)); ListResponse siteMembers = sitesProxy.getSiteMembers(testSite.getSiteId(), createParams(paging, null)); checkList(expectedSiteMembers.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), siteMembers); + + HttpResponse response = sitesProxy.getAll("sites", testSite.getSiteId(), "members", null, createParams(paging,Collections.singletonMap("includeSource", "true")), "Failed to get all site members"); + checkList(expectedSiteMembers.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), SiteMember.parseSiteMembers(testSite.getSiteId(), response.getJsonResponse())); + JSONObject source = sitesProxy.parseListSource(response.getJsonResponse()); + Site sourceSite = SiteImpl.parseSite(source); + assertNotNull(sourceSite); + assertEquals(testSite.getSiteId(), sourceSite.getSiteId()); + assertEquals(testSite.getGuid(), sourceSite.getGuid()); } // invalid site id diff --git a/source/test-java/org/alfresco/rest/api/tests/client/PublicApiClient.java b/source/test-java/org/alfresco/rest/api/tests/client/PublicApiClient.java index b2bbd5c79b..f3456df8a2 100644 --- a/source/test-java/org/alfresco/rest/api/tests/client/PublicApiClient.java +++ b/source/test-java/org/alfresco/rest/api/tests/client/PublicApiClient.java @@ -1,5 +1,7 @@ package org.alfresco.rest.api.tests.client; +import static org.junit.Assert.assertNotNull; + import java.io.IOException; import java.io.InputStream; import java.io.Serializable; @@ -725,6 +727,16 @@ public class PublicApiClient throw new PublicApiException(e); } } + + public JSONObject parseListSource(JSONObject jsonResponse) + { + JSONObject jsonList = (JSONObject)jsonResponse.get("list"); + assertNotNull(jsonList); + + JSONObject source = (JSONObject)jsonList.get("source"); + assertNotNull(source); + return source; + } } public static class ListResponse diff --git a/source/test-java/org/alfresco/rest/workflow/api/tests/ListParser.java b/source/test-java/org/alfresco/rest/workflow/api/tests/ListParser.java index 258f4902a3..8d8473d140 100644 --- a/source/test-java/org/alfresco/rest/workflow/api/tests/ListParser.java +++ b/source/test-java/org/alfresco/rest/workflow/api/tests/ListParser.java @@ -33,7 +33,7 @@ public abstract class ListParser public ListResponse parseList(JSONObject jsonResponse) { - List deployments = new ArrayList(); + List entries = new ArrayList(); JSONObject jsonList = (JSONObject)jsonResponse.get("list"); assertNotNull(jsonList); @@ -45,12 +45,12 @@ public abstract class ListParser { JSONObject jsonEntry = (JSONObject)jsonEntries.get(i); JSONObject entry = (JSONObject)jsonEntry.get("entry"); - deployments.add(parseEntry(entry)); + entries.add(parseEntry(entry)); } ExpectedPaging paging = ExpectedPaging.parsePagination(jsonList); - ListResponse resp = new ListResponse(paging, deployments); + ListResponse resp = new ListResponse(paging, entries); return resp; }