diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestGroupsModel.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestGroupsModel.java index d8a9b975b239..c5b7b7c1dd75 100644 --- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestGroupsModel.java +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestGroupsModel.java @@ -25,7 +25,7 @@ */ package org.alfresco.rest.model; -import java.util.ArrayList; +import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; @@ -46,9 +46,9 @@ public class RestGroupsModel extends TestModel implements IRestModel parentIds; + private List parentIds; @JsonProperty("zones") - private ArrayList zones; + private List zones; @JsonProperty(value = "entry") RestGroupsModel model; @@ -105,22 +105,22 @@ public void setIsRoot(Boolean isRoot) this.isRoot = isRoot; } - public ArrayList getParentIds() + public List getParentIds() { return parentIds; } - public void setParentIds(ArrayList parentIds) + public void setParentIds(List parentIds) { this.parentIds = parentIds; } - public ArrayList getZones() + public List getZones() { return zones; } - public void setZones(ArrayList zones) + public void setZones(List zones) { this.zones = zones; } diff --git a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/groups/GroupsTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/groups/GroupsTests.java index bfc9bf27c432..dc109b8248af 100644 --- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/groups/GroupsTests.java +++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/groups/GroupsTests.java @@ -31,10 +31,9 @@ public void dataPreparation() throws Exception @Test(groups = { TestGroup.REST_API, TestGroup.GROUPS, TestGroup.SANITY }) @TestRail(section = { TestGroup.REST_API, TestGroup.NODES }, executionType = ExecutionType.SANITY, description = "Verify creation, listing, updating and deletion of groups.") - public void createListUpdateAndDeleteGroup() throws Exception - { - String groupName = "ZtestGroup" + UUID.randomUUID().toString(); - String groupDescription = "ZtestGroup description" + UUID.randomUUID().toString(); + public void createListUpdateAndDeleteGroup() { + String groupName = "ZtestGroup" + UUID.randomUUID(); + String groupDescription = "ZtestGroup description" + UUID.randomUUID(); JsonObject groupBody = Json.createObjectBuilder().add("id", groupName).add("displayName", groupName).add("description", groupDescription).build(); String groupBodyCreate = groupBody.toString(); @@ -88,10 +87,9 @@ public void createListUpdateAndDeleteGroup() throws Exception @Test(groups = { TestGroup.REST_API, TestGroup.GROUPS, TestGroup.SANITY }) @TestRail(section = { TestGroup.REST_API, TestGroup.NODES }, executionType = ExecutionType.SANITY, description = "Verify creation, listing(only for person) and deletion of group memberships. ") - public void createListDeleteGroupMembership() throws Exception - { - String groupName = "ZtestGroup" + UUID.randomUUID().toString(); - String subGroupName = "ZtestSubgroup" + UUID.randomUUID().toString(); + public void createListDeleteGroupMembership() { + String groupName = "ZtestGroup" + UUID.randomUUID(); + String subGroupName = "ZtestSubgroup" + UUID.randomUUID(); JsonObject groupBody = Json.createObjectBuilder().add("id", groupName).add("displayName", groupName).build(); JsonObject subgroupBody = Json.createObjectBuilder().add("id", subGroupName).add("displayName", subGroupName).build(); String groupBodyCreate = groupBody.toString(); @@ -150,7 +148,7 @@ public void createListDeleteGroupMembership() throws Exception description = "Verify listing of group memberships.") public void listGroupMembership() throws Exception { - String groupName = "testGroup" + UUID.randomUUID().toString(); + String groupName = "testGroup" + UUID.randomUUID(); JsonObject groupBody = Json.createObjectBuilder().add("id", groupName).add("displayName", groupName).build(); String groupBodyCreate = groupBody.toString(); @@ -169,12 +167,10 @@ public void listGroupMembership() throws Exception restClient.assertStatusCodeIs(HttpStatus.CREATED); //ListGroupMembership - RetryOperation op = new RetryOperation(){ - public void execute() throws Exception{ - restClient.withCoreAPI().usingGroups().listGroupMemberships("GROUP_"+groupName) - .assertThat().entriesListContains("id", userModel.getUsername()); - restClient.assertStatusCodeIs(HttpStatus.OK); - } + RetryOperation op = () -> { + restClient.withCoreAPI().usingGroups().listGroupMemberships("GROUP_"+groupName) + .assertThat().entriesListContains("id", userModel.getUsername()); + restClient.assertStatusCodeIs(HttpStatus.OK); }; Utility.sleep(500, 35000, op);// Allow indexing to complete. } diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/GroupsImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/GroupsImpl.java index e58ee3428d7f..11939c552161 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/impl/GroupsImpl.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/GroupsImpl.java @@ -107,9 +107,9 @@ public class GroupsImpl implements Groups } // List groups filtering (via where clause) - private final static Set LIST_GROUPS_EQUALS_QUERY_PROPERTIES = new HashSet<>(Arrays.asList(new String[] { PARAM_IS_ROOT })); + private final static Set LIST_GROUPS_EQUALS_QUERY_PROPERTIES = new HashSet<>(List.of(PARAM_IS_ROOT)); - private final static Set LIST_GROUP_MEMBERS_QUERY_PROPERTIES = new HashSet<>(Arrays.asList(new String[] { PARAM_MEMBER_TYPE })); + private final static Set LIST_GROUP_MEMBERS_QUERY_PROPERTIES = new HashSet<>(List.of(PARAM_MEMBER_TYPE)); protected AuthorityService authorityService; protected NodeService nodeService; @@ -241,7 +241,7 @@ public CollectionWithPagingInfo getGroups(final Parameters parameters) private List createGroupsResponse(final List page, final List includeParam, final Set rootAuthorities) { - List groups = new AbstractList() + List groups = new AbstractList<>() { @Override public Group get(int index) @@ -656,7 +656,7 @@ private Pair getGroupsSortProp(Parameters parameters) Pair sortProp; List sortCols = parameters.getSorting(); - if ((sortCols != null) && (sortCols.size() > 0)) + if (sortCols != null && !sortCols.isEmpty()) { if (sortCols.size() > 1) { @@ -671,7 +671,7 @@ private Pair getGroupsSortProp(Parameters parameters) throw new InvalidArgumentException("Invalid sort field: " + sortCol.column); } - sortProp = new Pair<>(sortPropName, (sortCol.asc ? Boolean.TRUE : Boolean.FALSE)); + sortProp = new Pair<>(sortPropName, sortCol.asc ? Boolean.TRUE : Boolean.FALSE); } else { @@ -887,7 +887,7 @@ public void deleteGroupMembership(String groupId, String groupMemberId) // Verify if groupMemberId is member of groupId AuthorityType authorityType = AuthorityType.getAuthorityType(groupMemberId); - Set parents = authorityService.getContainingAuthorities(AuthorityType.GROUP, groupMemberId, true); + Set parents = authorityService.getContainingAuthorities(authorityType, groupMemberId, true); if (!parents.contains(groupId)) { throw new NotFoundException(groupMemberId + " is not member of " + groupId); @@ -1093,7 +1093,7 @@ private boolean authorityExists(AuthorityType authorityType, String authorityNam { String name = inferPrefix ? authorityService.getName(authorityType, authorityName) : authorityName; - return (name != null && authorityService.authorityExists(name)); + return name != null && authorityService.authorityExists(name); } private boolean isGroupAuthority(String authorityName) diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/Group.java b/remote-api/src/main/java/org/alfresco/rest/api/model/Group.java index 8b4a3647514f..0eccdf856ebd 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/model/Group.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/model/Group.java @@ -181,6 +181,6 @@ public String toString() public boolean wasSet(String fieldName) { Boolean b = setFields.get(fieldName); - return (b != null ? b : false); + return b != null ? b : false; } } \ No newline at end of file diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/groups/GroupsTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/groups/GroupsTest.java index e13a4e26fbe8..9e2a2e586502 100644 --- a/remote-api/src/test/java/org/alfresco/repo/web/scripts/groups/GroupsTest.java +++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/groups/GroupsTest.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.web.scripts.groups; @@ -54,717 +54,717 @@ /** * Unit test of Groups REST APIs. - * + * * /api/groups * /api/rootgroups - * + * * @author Mark Rogers */ public class GroupsTest extends BaseWebScriptTest -{ +{ private static final Log logger = LogFactory.getLog(BaseWebScriptTest.class); - - private MutableAuthenticationService authenticationService; - private AuthorityService authorityService; - private AuthenticationComponent authenticationComponent; - private PersonService personService; - - private String ADMIN_GROUP = "ALFRESCO_ADMINISTRATORS"; - private String EMAIL_GROUP = "EMAIL_CONTRIBUTORS"; - private String TEST_ROOTGROUP = "GroupsTest_ROOT"; - private String TEST_GROUPA = "TestA"; - private String TEST_GROUPB = "TESTB"; - private String TEST_GROUPC = "TesTC"; - private String TEST_GROUPD = "TESTD"; - private String TEST_GROUPE = "TestE"; - private String TEST_GROUPF = "TestF"; - private String TEST_GROUPG = "TestG"; - private String TEST_LINK = "TESTLINK"; - private String TEST_ROOTGROUP_DISPLAY_NAME = "GROUPS_TESTROOTDisplayName"; - - private static final String USER_ONE = "GroupTestOne"; - private static final String USER_TWO = "GroupTestTwo"; - private static final String USER_THREE = "GroupTestThree"; - - private static final String URL_GROUPS = "/api/groups"; - private static final String URL_ROOTGROUPS = "/api/rootgroups"; - - /** - * Test Tree for all group tests - * - * TEST_ROOTGROUP - * GROUPA - * GROUPB - * GROUPD - * GROUPE (in Share Zone) - * USER_TWO - * USER_THREE - * GROUPC - * USER_TWO - * GROUPF - * GROUPD - * GROUPG - * GROUPD - */ - private synchronized String createTestTree() - { - if(rootGroupName == null) - { - rootGroupName = authorityService.getName(AuthorityType.GROUP, TEST_ROOTGROUP); - } - - Set shareZones = new HashSet(1, 1.0f); - shareZones.add(AuthorityService.ZONE_APP_SHARE); - - if(!authorityService.authorityExists(rootGroupName)) - { - AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); - - rootGroupName = authorityService.createAuthority(AuthorityType.GROUP, TEST_ROOTGROUP, TEST_ROOTGROUP_DISPLAY_NAME, authorityService.getDefaultZones()); - String groupA = authorityService.createAuthority(AuthorityType.GROUP, TEST_GROUPA, TEST_GROUPA, authorityService.getDefaultZones()); - authorityService.addAuthority(rootGroupName, groupA); - String groupB = authorityService.createAuthority(AuthorityType.GROUP, TEST_GROUPB, TEST_GROUPB,authorityService.getDefaultZones()); - authorityService.addAuthority(rootGroupName, groupB); - String groupD = authorityService.createAuthority(AuthorityType.GROUP, TEST_GROUPD, TEST_GROUPD, authorityService.getDefaultZones()); - String groupE = authorityService.createAuthority(AuthorityType.GROUP, TEST_GROUPE, TEST_GROUPE, shareZones); - authorityService.addAuthority(groupB, groupD); - authorityService.addAuthority(groupB, groupE); - authorityService.addAuthority(groupB, USER_TWO); - authorityService.addAuthority(groupB, USER_THREE); - String groupF = authorityService.createAuthority(AuthorityType.GROUP, TEST_GROUPF, TEST_GROUPF, authorityService.getDefaultZones()); - authorityService.addAuthority(rootGroupName, groupF); - authorityService.addAuthority(groupF, groupD); - String groupG = authorityService.createAuthority(AuthorityType.GROUP, TEST_GROUPG, TEST_GROUPG, authorityService.getDefaultZones()); - authorityService.addAuthority(rootGroupName, groupG); - authorityService.addAuthority(groupG, groupD); - - String groupC = authorityService.createAuthority(AuthorityType.GROUP, TEST_GROUPC, TEST_GROUPC,authorityService.getDefaultZones()); - authorityService.addAuthority(rootGroupName, groupC); - authorityService.addAuthority(groupC, USER_TWO); - - String link = authorityService.createAuthority(AuthorityType.GROUP, TEST_LINK, TEST_LINK, authorityService.getDefaultZones()); - authorityService.addAuthority(rootGroupName, link); - - this.authenticationComponent.setCurrentUser(USER_ONE); - } - - return rootGroupName; - - } - - private static String rootGroupName = null; - @Override - protected void setUp() throws Exception - { - super.setUp(); - - this.authenticationService = (MutableAuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService"); - this.authenticationComponent = (AuthenticationComponent)getServer().getApplicationContext().getBean("authenticationComponent"); - this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService"); - this.authorityService = (AuthorityService)getServer().getApplicationContext().getBean("AuthorityService"); - - this.authenticationComponent.setSystemUserAsCurrentUser(); - - // Create users - createUser(USER_ONE); - createUser(USER_TWO); - createUser(USER_THREE); - - // Do tests as user one - this.authenticationComponent.setCurrentUser(USER_ONE); - } - - private void createUser(String userName) - { - if (this.authenticationService.authenticationExists(userName) == false) - { - this.authenticationService.createAuthentication(userName, "PWD".toCharArray()); - - PropertyMap ppOne = new PropertyMap(4); - ppOne.put(ContentModel.PROP_USERNAME, userName); - ppOne.put(ContentModel.PROP_FIRSTNAME, "firstName"); - ppOne.put(ContentModel.PROP_LASTNAME, "lastName"); - ppOne.put(ContentModel.PROP_EMAIL, "email@email.com"); - ppOne.put(ContentModel.PROP_JOBTITLE, "jobTitle"); - - this.personService.createPerson(ppOne); - } - } - - @Override - protected void tearDown() throws Exception - { - super.tearDown(); - this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName()); - } - - /** - * Detailed test of get root groups - */ - public void testGetRootGroup() throws Exception - { - createTestTree(); - - /** - * Get all root groups, regardless of zone, should be at least the ALFRESCO_ADMINISTRATORS, - * TEST_ROOTGROUP and EMAIL_CONTRIBUTORS groups - */ - { - Response response = sendRequest(new GetRequest(URL_ROOTGROUPS), Status.STATUS_OK); - JSONObject top = new JSONObject(response.getContentAsString()); - logger.debug(response.getContentAsString()); - //System.out.println(response.getContentAsString()); - JSONArray data = top.getJSONArray("data"); - assertTrue(data.length() >= 3); - boolean gotRootGroup = false; - boolean gotEmailGroup = false; - - - for(int i = 0; i < data.length(); i++) - { - JSONObject rootGroup = data.getJSONObject(i); - if(rootGroup.getString("shortName").equals(TEST_ROOTGROUP)) - { - // This is our test rootgroup - assertEquals("shortName wrong", TEST_ROOTGROUP, rootGroup.getString("shortName")); - assertEquals("displayName wrong", TEST_ROOTGROUP_DISPLAY_NAME, rootGroup.getString("displayName")); - assertEquals("authorityType wrong", "GROUP", rootGroup.getString("authorityType")); - gotRootGroup = true; - } - if(rootGroup.getString("shortName").equals(EMAIL_GROUP)) - { - gotEmailGroup = true; - } - } - assertTrue("root group not found", gotRootGroup); - assertTrue("email group not found", gotEmailGroup); - } - - - if(rootGroupName != null) - { - rootGroupName = authorityService.getName(AuthorityType.GROUP, TEST_ROOTGROUP); - } - - Set zones = authorityService.getAuthorityZones(rootGroupName); - assertTrue("root group is in APP.DEFAULT zone", zones.contains("APP.DEFAULT") ); - - /** - * Get all root groups in the application zone "APP.DEFAULT" - */ - { - Response response = sendRequest(new GetRequest(URL_ROOTGROUPS + "?zone=APP.DEFAULT"), Status.STATUS_OK); - JSONObject top = new JSONObject(response.getContentAsString()); - logger.debug(response.getContentAsString()); - //System.out.println(response.getContentAsString()); - JSONArray data = top.getJSONArray("data"); - - assertTrue(data.length() > 0); - - for(int i = 0; i < data.length(); i++) - { - JSONObject rootGroup = data.getJSONObject(i); - if(rootGroup.getString("shortName").equals(TEST_ROOTGROUP)) - { - // This is our test rootgroup - assertEquals("shortName wrong", TEST_ROOTGROUP, rootGroup.getString("shortName")); - assertEquals("displayName wrong", TEST_ROOTGROUP_DISPLAY_NAME, rootGroup.getString("displayName")); - assertEquals("authorityType wrong", "GROUP", rootGroup.getString("authorityType")); - } - } - } - - /** - * Get all root groups in the admin zone - */ - { - Response response = sendRequest(new GetRequest(URL_ROOTGROUPS + "?zone=AUTH.ALF"), Status.STATUS_OK); - JSONObject top = new JSONObject(response.getContentAsString()); - logger.debug(response.getContentAsString()); - JSONArray data = top.getJSONArray("data"); - assertTrue(data.length() > 0); - - for(int i = 0; i < data.length(); i++) - { - JSONObject rootGroup = data.getJSONObject(i); - if(rootGroup.getString("shortName").equals(TEST_ROOTGROUP)) - { - // This is our test rootgroup - assertEquals("shortName wrong", TEST_ROOTGROUP, rootGroup.getString("shortName")); - assertEquals("displayName wrong", TEST_ROOTGROUP_DISPLAY_NAME, rootGroup.getString("displayName")); - assertEquals("authorityType wrong", "GROUP", rootGroup.getString("authorityType")); - } - } - } - - /** - * Negative test Get all root groups in the a zone that does not exist - */ - { - Response response = sendRequest(new GetRequest(URL_ROOTGROUPS + "?zone=WIBBLE"), Status.STATUS_OK); - JSONObject top = new JSONObject(response.getContentAsString()); - logger.debug(response.getContentAsString()); - JSONArray data = top.getJSONArray("data"); - assertTrue(data.length() == 0); - // Should return no results - } - - } - - /** - * Detailed test of get group - */ - public void testGetGroup() throws Exception - { - createTestTree(); - - { - Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + ADMIN_GROUP), 200); - JSONObject top = new JSONObject(response.getContentAsString()); - logger.debug(response.getContentAsString()); - JSONObject data = top.getJSONObject("data"); - assertTrue(data.length() > 0); - } - - { - sendRequest(new GetRequest(URL_GROUPS + "/" + "crap"), Status.STATUS_NOT_FOUND); - } - - /** - * Get GROUP B - */ - { - Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + TEST_GROUPB), Status.STATUS_OK); - JSONObject top = new JSONObject(response.getContentAsString()); - logger.debug(response.getContentAsString()); - JSONObject data = top.getJSONObject("data"); - assertTrue(data.length() > 0); - } - - /** - * Get GROUP E which is in a different zone - */ - { - Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + TEST_GROUPE), Status.STATUS_OK); - JSONObject top = new JSONObject(response.getContentAsString()); - logger.debug(response.getContentAsString()); - JSONObject data = top.getJSONObject("data"); - assertTrue(data.length() > 0); - } - - } - - /** - * Detailed test of create root group - * Detailed test of delete root group - */ - public void testCreateRootGroup() throws Exception - { - String myGroupName = "GT_CRG"; - String myDisplayName = "GT_CRGDisplay"; - - /** - * Negative test - try to create a group without admin authority - */ - { - JSONObject newGroupJSON = new JSONObject(); - newGroupJSON.put("displayName", myDisplayName); - sendRequest(new PostRequest(URL_ROOTGROUPS + "/" + myGroupName, newGroupJSON.toString(), "application/json"), Status.STATUS_INTERNAL_SERVER_ERROR); - } - - - this.authenticationComponent.setSystemUserAsCurrentUser(); - - try - { - /** - * Create a root group - */ - { - JSONObject newGroupJSON = new JSONObject(); - newGroupJSON.put("displayName", myDisplayName); - Response response = sendRequest(new PostRequest(URL_ROOTGROUPS + "/" + myGroupName, newGroupJSON.toString(), "application/json"), Status.STATUS_CREATED); - JSONObject top = new JSONObject(response.getContentAsString()); - JSONObject rootGroup = top.getJSONObject("data"); - assertEquals("shortName wrong", myGroupName, rootGroup.getString("shortName")); - assertEquals("displayName wrong", myDisplayName, rootGroup.getString("displayName")); - } - - /** - * Negative test Create a root group that already exists - */ - { - JSONObject newGroupJSON = new JSONObject(); - newGroupJSON.put("displayName", myDisplayName); - sendRequest(new PostRequest(URL_ROOTGROUPS + "/" + myGroupName, newGroupJSON.toString(), "application/json"), Status.STATUS_BAD_REQUEST); - } - - /** - * Delete the root group - */ - sendRequest(new DeleteRequest(URL_ROOTGROUPS + "/" + myGroupName), Status.STATUS_OK); - - /** - * Attempt to delete the root group again - should fail - */ - sendRequest(new DeleteRequest(URL_ROOTGROUPS + "/" + myGroupName), Status.STATUS_NOT_FOUND); - - - } - finally - { - - /** - * Delete the root group - */ - sendRequest(new DeleteRequest(URL_ROOTGROUPS + "/" + myGroupName), 0); - } - } - - /** - * Detailed test of link group - */ - public void testLinkChild() throws Exception - { - String myRootGroup = "GT_LGROOT"; - - try - { - this.authenticationComponent.setSystemUserAsCurrentUser(); - sendRequest(new DeleteRequest(URL_ROOTGROUPS + "/" + myRootGroup), 0); - - String groupLinkFullName = ""; - { - Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + TEST_LINK), Status.STATUS_OK); - JSONObject top = new JSONObject(response.getContentAsString()); - logger.debug(response.getContentAsString()); - JSONObject data = top.getJSONObject("data"); - assertTrue(data.length() > 0); - groupLinkFullName = data.getString("fullName"); - } - - /** - * Create a root group - */ - { - JSONObject newGroupJSON = new JSONObject(); - newGroupJSON.put("displayName", myRootGroup); - sendRequest(new PostRequest(URL_ROOTGROUPS + "/" + myRootGroup, newGroupJSON.toString(), "application/json"), Status.STATUS_CREATED); - } - - /** - * Link an existing group (GROUPB) to my root group. - */ - - /** - * Negative test Link Group B without administrator access. - */ - this.authenticationComponent.setCurrentUser(USER_ONE); - { - JSONObject newGroupJSON = new JSONObject(); - sendRequest(new PostRequest(URL_GROUPS + "/" + myRootGroup +"/children/" + groupLinkFullName, newGroupJSON.toString(), "application/json" ), Status.STATUS_INTERNAL_SERVER_ERROR); - } - - this.authenticationComponent.setSystemUserAsCurrentUser(); - - /** - * Link Group B - */ - { - JSONObject newGroupJSON = new JSONObject(); - Response response = sendRequest(new PostRequest(URL_GROUPS + "/" + myRootGroup +"/children/" + groupLinkFullName, newGroupJSON.toString(), "application/json" ), Status.STATUS_OK); - JSONObject top = new JSONObject(response.getContentAsString()); - logger.debug(response.getContentAsString()); - JSONObject data = top.getJSONObject("data"); - } - - /** - * Link the group again - this fails - * - duplicate groups (children with the same name) are not allowed - */ - { - JSONObject newGroupJSON = new JSONObject(); - Response response = sendRequest(new PostRequest(URL_GROUPS + "/" + myRootGroup +"/children/" + groupLinkFullName, newGroupJSON.toString(), "application/json" ), Status.STATUS_INTERNAL_SERVER_ERROR); - } - - /** - * Get All Children of myGroup which are GROUPS - should find GROUP B - */ - { - logger.debug("Get child GROUPS of myRootGroup"); - Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + myRootGroup + "/children?authorityType=GROUP"), Status.STATUS_OK); - JSONObject top = new JSONObject(response.getContentAsString()); - logger.debug(response.getContentAsString()); - JSONArray data = top.getJSONArray("data"); - assertTrue("no child groups of myGroup", data.length() == 1); - - JSONObject subGroup = data.getJSONObject(0); - assertEquals("shortName wrong", TEST_LINK, subGroup.getString("shortName")); - assertEquals("authorityType wrong", "GROUP", subGroup.getString("authorityType")); - } - - /** - * Now link in an existing user - */ - { - JSONObject newGroupJSON = new JSONObject(); - String userOneFullName = USER_ONE; - Response response = sendRequest(new PostRequest(URL_GROUPS + "/" + myRootGroup +"/children/" + userOneFullName, newGroupJSON.toString(), "application/json" ), Status.STATUS_OK); - JSONObject top = new JSONObject(response.getContentAsString()); - logger.debug(response.getContentAsString()); - JSONObject data = top.getJSONObject("data"); - } - - /** - * Get All Children of myGroup which are USERS - should find USER ONE - */ - { - logger.debug("Get child USERS of myRootGroup"); - Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + myRootGroup + "/children?authorityType=USER"), Status.STATUS_OK); - JSONObject top = new JSONObject(response.getContentAsString()); - logger.debug(response.getContentAsString()); - JSONArray data = top.getJSONArray("data"); - assertTrue("no child groups of myGroup", data.length() == 1); - - JSONObject subGroup = data.getJSONObject(0); - assertEquals("shortName wrong", USER_ONE, subGroup.getString("shortName")); - assertEquals("authorityType wrong", "USER", subGroup.getString("authorityType")); - } - - /** - * Unlink Group B - */ - { - logger.debug("Unlink Test Link"); - Response response = sendRequest(new DeleteRequest(URL_GROUPS + "/" + myRootGroup +"/children/" + groupLinkFullName ), Status.STATUS_OK); - JSONObject top = new JSONObject(response.getContentAsString()); - logger.debug(response.getContentAsString()); - - } - - /** - * Get All Children of myGroup which are GROUPS - should no longer find GROUP B - */ - { - logger.debug("Get child GROUPS of myRootGroup"); - Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + myRootGroup + "/children?authorityType=GROUP"), Status.STATUS_OK); - JSONObject top = new JSONObject(response.getContentAsString()); - logger.debug(response.getContentAsString()); - JSONArray data = top.getJSONArray("data"); - //TODO TEST failing - - //assertTrue("group B not removed", data.length() == 0); - } - - /** - * Create a new group (BUFFY) - */ - String myNewGroup = "GROUP_BUFFY"; - { - // Delete incase it already exists from a previous test run - sendRequest(new DeleteRequest(URL_ROOTGROUPS + "/BUFFY"), 0); - - JSONObject newGroupJSON = new JSONObject(); - Response response = sendRequest(new PostRequest(URL_GROUPS + "/" + myRootGroup +"/children/" + myNewGroup, newGroupJSON.toString(), "application/json" ), Status.STATUS_CREATED); - JSONObject top = new JSONObject(response.getContentAsString()); - logger.debug(response.getContentAsString()); - JSONObject data = top.getJSONObject("data"); - assertEquals("shortName wrong", "BUFFY", data.getString("shortName")); - assertEquals("fullName wrong", myNewGroup, data.getString("fullName")); - assertEquals("authorityType wrong", "GROUP", data.getString("authorityType")); - } - - /** - * Get All Children of myGroup which are GROUPS - should find GROUP(BUFFY) - */ - { - logger.debug("Get child GROUPS of myRootGroup"); - Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + myRootGroup + "/children?authorityType=GROUP"), Status.STATUS_OK); - JSONObject top = new JSONObject(response.getContentAsString()); - logger.debug(response.getContentAsString()); - JSONArray data = top.getJSONArray("data"); - for(int i = 0; i < data.length(); i++) - { - JSONObject rootGroup = data.getJSONObject(i); - if(rootGroup.getString("fullName").equals(myNewGroup)) - { - - } - } - - } - - /** - * Negative tests - */ - - } - finally - { - sendRequest(new DeleteRequest(URL_ROOTGROUPS + "/" + myRootGroup), 0); - } - } - - /** - * Detailed test of update group - * @throws Exception - */ - public void testUpdateGroup() throws Exception - { - String myGroupName = "GT_UG"; - String myDisplayName = "GT_UGDisplay"; - String myNewDisplayName = "GT_UGDisplayNew"; - - this.authenticationComponent.setSystemUserAsCurrentUser(); - - try - { - /** - * Create a root group - */ - { - JSONObject newGroupJSON = new JSONObject(); - newGroupJSON.put("displayName", myDisplayName); - sendRequest(new PostRequest(URL_ROOTGROUPS + "/" + myGroupName, newGroupJSON.toString(), "application/json"), Status.STATUS_CREATED); - } - - /** - * Now change its display name - */ - { - JSONObject newGroupJSON = new JSONObject(); - newGroupJSON.put("displayName", myNewDisplayName); - Response response = sendRequest(new PutRequest(URL_GROUPS + "/" + myGroupName, newGroupJSON.toString(), "application/json"), Status.STATUS_OK); - JSONObject top = new JSONObject(response.getContentAsString()); - logger.debug(response.getContentAsString()); - JSONObject data = top.getJSONObject("data"); - assertTrue(data.length() > 0); - assertEquals("displayName wrong", myNewDisplayName, data.getString("displayName")); - - } - - /** - * Now get it and verify that the name has changed - */ - { - Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + myGroupName), Status.STATUS_OK); - JSONObject top = new JSONObject(response.getContentAsString()); - logger.debug(response.getContentAsString()); - JSONObject data = top.getJSONObject("data"); - assertTrue(data.length() > 0); - assertEquals("displayName wrong", myNewDisplayName, data.getString("displayName")); - - } - - /** - * Negative test - */ - { - JSONObject newGroupJSON = new JSONObject(); - newGroupJSON.put("displayName", myNewDisplayName); - sendRequest(new PutRequest(URL_GROUPS + "/" + "rubbish", newGroupJSON.toString(), "application/json"), Status.STATUS_NOT_FOUND); - } - } - finally - { - sendRequest(new DeleteRequest(URL_ROOTGROUPS + "/" + myGroupName), 0); - } - } - - - /** - * Detailed test of search groups - *
  • if the optional includeInternal parameter is true then will include internal groups, otherwise internalGroups are not returned.
    • -
  • If the optional shortNameFilter parameter is set then returns those root groups with a partial match on shortName.
    • - */ - public void testSearchGroups() throws Exception - { - createTestTree(); - - // Search on partial short name - { - Response response = sendRequest(new GetRequest(URL_GROUPS + "?shortNameFilter=" + "ALFRESCO_ADMIN*"), Status.STATUS_OK); - JSONObject top = new JSONObject(response.getContentAsString()); - logger.debug(response.getContentAsString()); - JSONArray data = top.getJSONArray("data"); - assertEquals("length not 1", 1, data.length()); - JSONObject authority = data.getJSONObject(0); + + private MutableAuthenticationService authenticationService; + private AuthorityService authorityService; + private AuthenticationComponent authenticationComponent; + private PersonService personService; + + private String ADMIN_GROUP = "ALFRESCO_ADMINISTRATORS"; + private String EMAIL_GROUP = "EMAIL_CONTRIBUTORS"; + private String TEST_ROOTGROUP = "GroupsTest_ROOT"; + private String TEST_GROUPA = "TestA"; + private String TEST_GROUPB = "TESTB"; + private String TEST_GROUPC = "TesTC"; + private String TEST_GROUPD = "TESTD"; + private String TEST_GROUPE = "TestE"; + private String TEST_GROUPF = "TestF"; + private String TEST_GROUPG = "TestG"; + private String TEST_LINK = "TESTLINK"; + private String TEST_ROOTGROUP_DISPLAY_NAME = "GROUPS_TESTROOTDisplayName"; + + private static final String USER_ONE = "GroupTestOne"; + private static final String USER_TWO = "GroupTestTwo"; + private static final String USER_THREE = "GroupTestThree"; + + private static final String URL_GROUPS = "/api/groups"; + private static final String URL_ROOTGROUPS = "/api/rootgroups"; + + /** + * Test Tree for all group tests + * + * TEST_ROOTGROUP + * GROUPA + * GROUPB + * GROUPD + * GROUPE (in Share Zone) + * USER_TWO + * USER_THREE + * GROUPC + * USER_TWO + * GROUPF + * GROUPD + * GROUPG + * GROUPD + */ + private synchronized String createTestTree() + { + if(rootGroupName == null) + { + rootGroupName = authorityService.getName(AuthorityType.GROUP, TEST_ROOTGROUP); + } + + Set shareZones = new HashSet(1, 1.0f); + shareZones.add(AuthorityService.ZONE_APP_SHARE); + + if(!authorityService.authorityExists(rootGroupName)) + { + AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); + + rootGroupName = authorityService.createAuthority(AuthorityType.GROUP, TEST_ROOTGROUP, TEST_ROOTGROUP_DISPLAY_NAME, authorityService.getDefaultZones()); + String groupA = authorityService.createAuthority(AuthorityType.GROUP, TEST_GROUPA, TEST_GROUPA, authorityService.getDefaultZones()); + authorityService.addAuthority(rootGroupName, groupA); + String groupB = authorityService.createAuthority(AuthorityType.GROUP, TEST_GROUPB, TEST_GROUPB,authorityService.getDefaultZones()); + authorityService.addAuthority(rootGroupName, groupB); + String groupD = authorityService.createAuthority(AuthorityType.GROUP, TEST_GROUPD, TEST_GROUPD, authorityService.getDefaultZones()); + String groupE = authorityService.createAuthority(AuthorityType.GROUP, TEST_GROUPE, TEST_GROUPE, shareZones); + authorityService.addAuthority(groupB, groupD); + authorityService.addAuthority(groupB, groupE); + authorityService.addAuthority(groupB, USER_TWO); + authorityService.addAuthority(groupB, USER_THREE); + String groupF = authorityService.createAuthority(AuthorityType.GROUP, TEST_GROUPF, TEST_GROUPF, authorityService.getDefaultZones()); + authorityService.addAuthority(rootGroupName, groupF); + authorityService.addAuthority(groupF, groupD); + String groupG = authorityService.createAuthority(AuthorityType.GROUP, TEST_GROUPG, TEST_GROUPG, authorityService.getDefaultZones()); + authorityService.addAuthority(rootGroupName, groupG); + authorityService.addAuthority(groupG, groupD); + + String groupC = authorityService.createAuthority(AuthorityType.GROUP, TEST_GROUPC, TEST_GROUPC,authorityService.getDefaultZones()); + authorityService.addAuthority(rootGroupName, groupC); + authorityService.addAuthority(groupC, USER_TWO); + + String link = authorityService.createAuthority(AuthorityType.GROUP, TEST_LINK, TEST_LINK, authorityService.getDefaultZones()); + authorityService.addAuthority(rootGroupName, link); + + this.authenticationComponent.setCurrentUser(USER_ONE); + } + + return rootGroupName; + + } + + private static String rootGroupName = null; + @Override + protected void setUp() throws Exception + { + super.setUp(); + + this.authenticationService = (MutableAuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService"); + this.authenticationComponent = (AuthenticationComponent)getServer().getApplicationContext().getBean("authenticationComponent"); + this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService"); + this.authorityService = (AuthorityService)getServer().getApplicationContext().getBean("AuthorityService"); + + this.authenticationComponent.setSystemUserAsCurrentUser(); + + // Create users + createUser(USER_ONE); + createUser(USER_TWO); + createUser(USER_THREE); + + // Do tests as user one + this.authenticationComponent.setCurrentUser(USER_ONE); + } + + private void createUser(String userName) + { + if (this.authenticationService.authenticationExists(userName) == false) + { + this.authenticationService.createAuthentication(userName, "PWD".toCharArray()); + + PropertyMap ppOne = new PropertyMap(4); + ppOne.put(ContentModel.PROP_USERNAME, userName); + ppOne.put(ContentModel.PROP_FIRSTNAME, "firstName"); + ppOne.put(ContentModel.PROP_LASTNAME, "lastName"); + ppOne.put(ContentModel.PROP_EMAIL, "email@email.com"); + ppOne.put(ContentModel.PROP_JOBTITLE, "jobTitle"); + + this.personService.createPerson(ppOne); + } + } + + @Override + protected void tearDown() throws Exception + { + super.tearDown(); + this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName()); + } + + /** + * Detailed test of get root groups + */ + public void testGetRootGroup() throws Exception + { + createTestTree(); + + /** + * Get all root groups, regardless of zone, should be at least the ALFRESCO_ADMINISTRATORS, + * TEST_ROOTGROUP and EMAIL_CONTRIBUTORS groups + */ + { + Response response = sendRequest(new GetRequest(URL_ROOTGROUPS), Status.STATUS_OK); + JSONObject top = new JSONObject(response.getContentAsString()); + logger.debug(response.getContentAsString()); + //System.out.println(response.getContentAsString()); + JSONArray data = top.getJSONArray("data"); + assertTrue(data.length() >= 3); + boolean gotRootGroup = false; + boolean gotEmailGroup = false; + + + for(int i = 0; i < data.length(); i++) + { + JSONObject rootGroup = data.getJSONObject(i); + if(rootGroup.getString("shortName").equals(TEST_ROOTGROUP)) + { + // This is our test rootgroup + assertEquals("shortName wrong", TEST_ROOTGROUP, rootGroup.getString("shortName")); + assertEquals("displayName wrong", TEST_ROOTGROUP_DISPLAY_NAME, rootGroup.getString("displayName")); + assertEquals("authorityType wrong", "GROUP", rootGroup.getString("authorityType")); + gotRootGroup = true; + } + if(rootGroup.getString("shortName").equals(EMAIL_GROUP)) + { + gotEmailGroup = true; + } + } + assertTrue("root group not found", gotRootGroup); + assertTrue("email group not found", gotEmailGroup); + } + + + if(rootGroupName != null) + { + rootGroupName = authorityService.getName(AuthorityType.GROUP, TEST_ROOTGROUP); + } + + Set zones = authorityService.getAuthorityZones(rootGroupName); + assertTrue("root group is in APP.DEFAULT zone", zones.contains("APP.DEFAULT") ); + + /** + * Get all root groups in the application zone "APP.DEFAULT" + */ + { + Response response = sendRequest(new GetRequest(URL_ROOTGROUPS + "?zone=APP.DEFAULT"), Status.STATUS_OK); + JSONObject top = new JSONObject(response.getContentAsString()); + logger.debug(response.getContentAsString()); + //System.out.println(response.getContentAsString()); + JSONArray data = top.getJSONArray("data"); + + assertTrue(data.length() > 0); + + for(int i = 0; i < data.length(); i++) + { + JSONObject rootGroup = data.getJSONObject(i); + if(rootGroup.getString("shortName").equals(TEST_ROOTGROUP)) + { + // This is our test rootgroup + assertEquals("shortName wrong", TEST_ROOTGROUP, rootGroup.getString("shortName")); + assertEquals("displayName wrong", TEST_ROOTGROUP_DISPLAY_NAME, rootGroup.getString("displayName")); + assertEquals("authorityType wrong", "GROUP", rootGroup.getString("authorityType")); + } + } + } + + /** + * Get all root groups in the admin zone + */ + { + Response response = sendRequest(new GetRequest(URL_ROOTGROUPS + "?zone=AUTH.ALF"), Status.STATUS_OK); + JSONObject top = new JSONObject(response.getContentAsString()); + logger.debug(response.getContentAsString()); + JSONArray data = top.getJSONArray("data"); + assertTrue(data.length() > 0); + + for(int i = 0; i < data.length(); i++) + { + JSONObject rootGroup = data.getJSONObject(i); + if(rootGroup.getString("shortName").equals(TEST_ROOTGROUP)) + { + // This is our test rootgroup + assertEquals("shortName wrong", TEST_ROOTGROUP, rootGroup.getString("shortName")); + assertEquals("displayName wrong", TEST_ROOTGROUP_DISPLAY_NAME, rootGroup.getString("displayName")); + assertEquals("authorityType wrong", "GROUP", rootGroup.getString("authorityType")); + } + } + } + + /** + * Negative test Get all root groups in the a zone that does not exist + */ + { + Response response = sendRequest(new GetRequest(URL_ROOTGROUPS + "?zone=WIBBLE"), Status.STATUS_OK); + JSONObject top = new JSONObject(response.getContentAsString()); + logger.debug(response.getContentAsString()); + JSONArray data = top.getJSONArray("data"); + assertTrue(data.length() == 0); + // Should return no results + } + + } + + /** + * Detailed test of get group + */ + public void testGetGroup() throws Exception + { + createTestTree(); + + { + Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + ADMIN_GROUP), 200); + JSONObject top = new JSONObject(response.getContentAsString()); + logger.debug(response.getContentAsString()); + JSONObject data = top.getJSONObject("data"); + assertTrue(data.length() > 0); + } + + { + sendRequest(new GetRequest(URL_GROUPS + "/" + "crap"), Status.STATUS_NOT_FOUND); + } + + /** + * Get GROUP B + */ + { + Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + TEST_GROUPB), Status.STATUS_OK); + JSONObject top = new JSONObject(response.getContentAsString()); + logger.debug(response.getContentAsString()); + JSONObject data = top.getJSONObject("data"); + assertTrue(data.length() > 0); + } + + /** + * Get GROUP E which is in a different zone + */ + { + Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + TEST_GROUPE), Status.STATUS_OK); + JSONObject top = new JSONObject(response.getContentAsString()); + logger.debug(response.getContentAsString()); + JSONObject data = top.getJSONObject("data"); + assertTrue(data.length() > 0); + } + + } + + /** + * Detailed test of create root group + * Detailed test of delete root group + */ + public void testCreateRootGroup() throws Exception + { + String myGroupName = "GT_CRG"; + String myDisplayName = "GT_CRGDisplay"; + + /** + * Negative test - try to create a group without admin authority + */ + { + JSONObject newGroupJSON = new JSONObject(); + newGroupJSON.put("displayName", myDisplayName); + sendRequest(new PostRequest(URL_ROOTGROUPS + "/" + myGroupName, newGroupJSON.toString(), "application/json"), Status.STATUS_INTERNAL_SERVER_ERROR); + } + + + this.authenticationComponent.setSystemUserAsCurrentUser(); + + try + { + /** + * Create a root group + */ + { + JSONObject newGroupJSON = new JSONObject(); + newGroupJSON.put("displayName", myDisplayName); + Response response = sendRequest(new PostRequest(URL_ROOTGROUPS + "/" + myGroupName, newGroupJSON.toString(), "application/json"), Status.STATUS_CREATED); + JSONObject top = new JSONObject(response.getContentAsString()); + JSONObject rootGroup = top.getJSONObject("data"); + assertEquals("shortName wrong", myGroupName, rootGroup.getString("shortName")); + assertEquals("displayName wrong", myDisplayName, rootGroup.getString("displayName")); + } + + /** + * Negative test Create a root group that already exists + */ + { + JSONObject newGroupJSON = new JSONObject(); + newGroupJSON.put("displayName", myDisplayName); + sendRequest(new PostRequest(URL_ROOTGROUPS + "/" + myGroupName, newGroupJSON.toString(), "application/json"), Status.STATUS_BAD_REQUEST); + } + + /** + * Delete the root group + */ + sendRequest(new DeleteRequest(URL_ROOTGROUPS + "/" + myGroupName), Status.STATUS_OK); + + /** + * Attempt to delete the root group again - should fail + */ + sendRequest(new DeleteRequest(URL_ROOTGROUPS + "/" + myGroupName), Status.STATUS_NOT_FOUND); + + + } + finally + { + + /** + * Delete the root group + */ + sendRequest(new DeleteRequest(URL_ROOTGROUPS + "/" + myGroupName), 0); + } + } + + /** + * Detailed test of link group + */ + public void testLinkChild() throws Exception + { + String myRootGroup = "GT_LGROOT"; + + try + { + this.authenticationComponent.setSystemUserAsCurrentUser(); + sendRequest(new DeleteRequest(URL_ROOTGROUPS + "/" + myRootGroup), 0); + + String groupLinkFullName = ""; + { + Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + TEST_LINK), Status.STATUS_OK); + JSONObject top = new JSONObject(response.getContentAsString()); + logger.debug(response.getContentAsString()); + JSONObject data = top.getJSONObject("data"); + assertTrue(data.length() > 0); + groupLinkFullName = data.getString("fullName"); + } + + /** + * Create a root group + */ + { + JSONObject newGroupJSON = new JSONObject(); + newGroupJSON.put("displayName", myRootGroup); + sendRequest(new PostRequest(URL_ROOTGROUPS + "/" + myRootGroup, newGroupJSON.toString(), "application/json"), Status.STATUS_CREATED); + } + + /** + * Link an existing group (GROUPB) to my root group. + */ + + /** + * Negative test Link Group B without administrator access. + */ + this.authenticationComponent.setCurrentUser(USER_ONE); + { + JSONObject newGroupJSON = new JSONObject(); + sendRequest(new PostRequest(URL_GROUPS + "/" + myRootGroup +"/children/" + groupLinkFullName, newGroupJSON.toString(), "application/json" ), Status.STATUS_INTERNAL_SERVER_ERROR); + } + + this.authenticationComponent.setSystemUserAsCurrentUser(); + + /** + * Link Group B + */ + { + JSONObject newGroupJSON = new JSONObject(); + Response response = sendRequest(new PostRequest(URL_GROUPS + "/" + myRootGroup +"/children/" + groupLinkFullName, newGroupJSON.toString(), "application/json" ), Status.STATUS_OK); + JSONObject top = new JSONObject(response.getContentAsString()); + logger.debug(response.getContentAsString()); + JSONObject data = top.getJSONObject("data"); + } + + /** + * Link the group again - this fails + * - duplicate groups (children with the same name) are not allowed + */ + { + JSONObject newGroupJSON = new JSONObject(); + Response response = sendRequest(new PostRequest(URL_GROUPS + "/" + myRootGroup +"/children/" + groupLinkFullName, newGroupJSON.toString(), "application/json" ), Status.STATUS_INTERNAL_SERVER_ERROR); + } + + /** + * Get All Children of myGroup which are GROUPS - should find GROUP B + */ + { + logger.debug("Get child GROUPS of myRootGroup"); + Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + myRootGroup + "/children?authorityType=GROUP"), Status.STATUS_OK); + JSONObject top = new JSONObject(response.getContentAsString()); + logger.debug(response.getContentAsString()); + JSONArray data = top.getJSONArray("data"); + assertTrue("no child groups of myGroup", data.length() == 1); + + JSONObject subGroup = data.getJSONObject(0); + assertEquals("shortName wrong", TEST_LINK, subGroup.getString("shortName")); + assertEquals("authorityType wrong", "GROUP", subGroup.getString("authorityType")); + } + + /** + * Now link in an existing user + */ + { + JSONObject newGroupJSON = new JSONObject(); + String userOneFullName = USER_ONE; + Response response = sendRequest(new PostRequest(URL_GROUPS + "/" + myRootGroup +"/children/" + userOneFullName, newGroupJSON.toString(), "application/json" ), Status.STATUS_OK); + JSONObject top = new JSONObject(response.getContentAsString()); + logger.debug(response.getContentAsString()); + JSONObject data = top.getJSONObject("data"); + } + + /** + * Get All Children of myGroup which are USERS - should find USER ONE + */ + { + logger.debug("Get child USERS of myRootGroup"); + Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + myRootGroup + "/children?authorityType=USER"), Status.STATUS_OK); + JSONObject top = new JSONObject(response.getContentAsString()); + logger.debug(response.getContentAsString()); + JSONArray data = top.getJSONArray("data"); + assertTrue("no child groups of myGroup", data.length() == 1); + + JSONObject subGroup = data.getJSONObject(0); + assertEquals("shortName wrong", USER_ONE, subGroup.getString("shortName")); + assertEquals("authorityType wrong", "USER", subGroup.getString("authorityType")); + } + + /** + * Unlink Group B + */ + { + logger.debug("Unlink Test Link"); + Response response = sendRequest(new DeleteRequest(URL_GROUPS + "/" + myRootGroup +"/children/" + groupLinkFullName ), Status.STATUS_OK); + JSONObject top = new JSONObject(response.getContentAsString()); + logger.debug(response.getContentAsString()); + + } + + /** + * Get All Children of myGroup which are GROUPS - should no longer find GROUP B + */ + { + logger.debug("Get child GROUPS of myRootGroup"); + Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + myRootGroup + "/children?authorityType=GROUP"), Status.STATUS_OK); + JSONObject top = new JSONObject(response.getContentAsString()); + logger.debug(response.getContentAsString()); + JSONArray data = top.getJSONArray("data"); + //TODO TEST failing + + //assertTrue("group B not removed", data.length() == 0); + } + + /** + * Create a new group (BUFFY) + */ + String myNewGroup = "GROUP_BUFFY"; + { + // Delete incase it already exists from a previous test run + sendRequest(new DeleteRequest(URL_ROOTGROUPS + "/BUFFY"), 0); + + JSONObject newGroupJSON = new JSONObject(); + Response response = sendRequest(new PostRequest(URL_GROUPS + "/" + myRootGroup +"/children/" + myNewGroup, newGroupJSON.toString(), "application/json" ), Status.STATUS_CREATED); + JSONObject top = new JSONObject(response.getContentAsString()); + logger.debug(response.getContentAsString()); + JSONObject data = top.getJSONObject("data"); + assertEquals("shortName wrong", "BUFFY", data.getString("shortName")); + assertEquals("fullName wrong", myNewGroup, data.getString("fullName")); + assertEquals("authorityType wrong", "GROUP", data.getString("authorityType")); + } + + /** + * Get All Children of myGroup which are GROUPS - should find GROUP(BUFFY) + */ + { + logger.debug("Get child GROUPS of myRootGroup"); + Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + myRootGroup + "/children?authorityType=GROUP"), Status.STATUS_OK); + JSONObject top = new JSONObject(response.getContentAsString()); + logger.debug(response.getContentAsString()); + JSONArray data = top.getJSONArray("data"); + for(int i = 0; i < data.length(); i++) + { + JSONObject rootGroup = data.getJSONObject(i); + if(rootGroup.getString("fullName").equals(myNewGroup)) + { + + } + } + + } + + /** + * Negative tests + */ + + } + finally + { + sendRequest(new DeleteRequest(URL_ROOTGROUPS + "/" + myRootGroup), 0); + } + } + + /** + * Detailed test of update group + * @throws Exception + */ + public void testUpdateGroup() throws Exception + { + String myGroupName = "GT_UG"; + String myDisplayName = "GT_UGDisplay"; + String myNewDisplayName = "GT_UGDisplayNew"; + + this.authenticationComponent.setSystemUserAsCurrentUser(); + + try + { + /** + * Create a root group + */ + { + JSONObject newGroupJSON = new JSONObject(); + newGroupJSON.put("displayName", myDisplayName); + sendRequest(new PostRequest(URL_ROOTGROUPS + "/" + myGroupName, newGroupJSON.toString(), "application/json"), Status.STATUS_CREATED); + } + + /** + * Now change its display name + */ + { + JSONObject newGroupJSON = new JSONObject(); + newGroupJSON.put("displayName", myNewDisplayName); + Response response = sendRequest(new PutRequest(URL_GROUPS + "/" + myGroupName, newGroupJSON.toString(), "application/json"), Status.STATUS_OK); + JSONObject top = new JSONObject(response.getContentAsString()); + logger.debug(response.getContentAsString()); + JSONObject data = top.getJSONObject("data"); + assertTrue(data.length() > 0); + assertEquals("displayName wrong", myNewDisplayName, data.getString("displayName")); + + } + + /** + * Now get it and verify that the name has changed + */ + { + Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + myGroupName), Status.STATUS_OK); + JSONObject top = new JSONObject(response.getContentAsString()); + logger.debug(response.getContentAsString()); + JSONObject data = top.getJSONObject("data"); + assertTrue(data.length() > 0); + assertEquals("displayName wrong", myNewDisplayName, data.getString("displayName")); + + } + + /** + * Negative test + */ + { + JSONObject newGroupJSON = new JSONObject(); + newGroupJSON.put("displayName", myNewDisplayName); + sendRequest(new PutRequest(URL_GROUPS + "/" + "rubbish", newGroupJSON.toString(), "application/json"), Status.STATUS_NOT_FOUND); + } + } + finally + { + sendRequest(new DeleteRequest(URL_ROOTGROUPS + "/" + myGroupName), 0); + } + } + + + /** + * Detailed test of search groups + *
  • if the optional includeInternal parameter is true then will include internal groups, otherwise internalGroups are not returned.
    • +
  • If the optional shortNameFilter parameter is set then returns those root groups with a partial match on shortName.
    • + */ + public void testSearchGroups() throws Exception + { + createTestTree(); + + // Search on partial short name + { + Response response = sendRequest(new GetRequest(URL_GROUPS + "?shortNameFilter=" + "ALFRESCO_ADMIN*"), Status.STATUS_OK); + JSONObject top = new JSONObject(response.getContentAsString()); + logger.debug(response.getContentAsString()); + JSONArray data = top.getJSONArray("data"); + assertEquals("length not 1", 1, data.length()); + JSONObject authority = data.getJSONObject(0); assertEquals("", ADMIN_GROUP, authority.getString("shortName")); - } - - // Search on partial short name with a ? - { - Response response = sendRequest(new GetRequest(URL_GROUPS + "?shortNameFilter=" + "ALFRE?CO_ADMIN*"), Status.STATUS_OK); - JSONObject top = new JSONObject(response.getContentAsString()); - logger.debug(response.getContentAsString()); - JSONArray data = top.getJSONArray("data"); - assertEquals("length not 1", 1, data.length()); - JSONObject authority = data.getJSONObject(0); + } + + // Search on partial short name with a ? + { + Response response = sendRequest(new GetRequest(URL_GROUPS + "?shortNameFilter=" + "ALFRE?CO_ADMIN*"), Status.STATUS_OK); + JSONObject top = new JSONObject(response.getContentAsString()); + logger.debug(response.getContentAsString()); + JSONArray data = top.getJSONArray("data"); + assertEquals("length not 1", 1, data.length()); + JSONObject authority = data.getJSONObject(0); assertEquals("", ADMIN_GROUP, authority.getString("shortName")); - } - - // Negative test. - { - Response response = sendRequest(new GetRequest(URL_GROUPS + "?shortNameFilter=" + "XX?X"), Status.STATUS_OK); - JSONObject top = new JSONObject(response.getContentAsString()); - logger.debug(response.getContentAsString()); - JSONArray data = top.getJSONArray("data"); - assertEquals("length not 0", 0, data.length()); - } - - // Search on full shortName + } + + // Negative test. + { + Response response = sendRequest(new GetRequest(URL_GROUPS + "?shortNameFilter=" + "XX?X"), Status.STATUS_OK); + JSONObject top = new JSONObject(response.getContentAsString()); + logger.debug(response.getContentAsString()); + JSONArray data = top.getJSONArray("data"); + assertEquals("length not 0", 0, data.length()); + } + + // Search on full shortName { - Response response = sendRequest(new GetRequest(URL_GROUPS + "?shortNameFilter=" + ADMIN_GROUP), Status.STATUS_OK); - JSONObject top = new JSONObject(response.getContentAsString()); - logger.debug(response.getContentAsString()); - JSONArray data = top.getJSONArray("data"); - assertEquals("length not 1", 1, data.length()); - JSONObject authority = data.getJSONObject(0); + Response response = sendRequest(new GetRequest(URL_GROUPS + "?shortNameFilter=" + ADMIN_GROUP), Status.STATUS_OK); + JSONObject top = new JSONObject(response.getContentAsString()); + logger.debug(response.getContentAsString()); + JSONArray data = top.getJSONArray("data"); + assertEquals("length not 1", 1, data.length()); + JSONObject authority = data.getJSONObject(0); assertEquals("", ADMIN_GROUP, authority.getString("shortName")); } - - // Search on partial short name of a non root group - { - Response response = sendRequest(new GetRequest(URL_GROUPS + "?shortNameFilter=" + TEST_GROUPD ), Status.STATUS_OK); - JSONObject top = new JSONObject(response.getContentAsString()); - logger.debug(response.getContentAsString()); - //System.out.println(response.getContentAsString()); - JSONArray data = top.getJSONArray("data"); - assertEquals("length not 1", 1, data.length()); - JSONObject authority = data.getJSONObject(0); + + // Search on partial short name of a non root group + { + Response response = sendRequest(new GetRequest(URL_GROUPS + "?shortNameFilter=" + TEST_GROUPD ), Status.STATUS_OK); + JSONObject top = new JSONObject(response.getContentAsString()); + logger.debug(response.getContentAsString()); + //System.out.println(response.getContentAsString()); + JSONArray data = top.getJSONArray("data"); + assertEquals("length not 1", 1, data.length()); + JSONObject authority = data.getJSONObject(0); assertEquals("", TEST_GROUPD, authority.getString("shortName")); - } - - // Search on partial short name of a non root group in default zone - { - String url = URL_GROUPS + "?shortNameFilter=" + TEST_GROUPD + "& zone=" + AuthorityService.ZONE_APP_DEFAULT; - Response response = sendRequest(new GetRequest(url ), Status.STATUS_OK); - JSONObject top = new JSONObject(response.getContentAsString()); - logger.debug(response.getContentAsString()); - //System.out.println(response.getContentAsString()); - JSONArray data = top.getJSONArray("data"); - assertEquals("length not 1", 1, data.length()); - JSONObject authority = data.getJSONObject(0); + } + + // Search on partial short name of a non root group in default zone + { + String url = URL_GROUPS + "?shortNameFilter=" + TEST_GROUPD + "& zone=" + AuthorityService.ZONE_APP_DEFAULT; + Response response = sendRequest(new GetRequest(url ), Status.STATUS_OK); + JSONObject top = new JSONObject(response.getContentAsString()); + logger.debug(response.getContentAsString()); + //System.out.println(response.getContentAsString()); + JSONArray data = top.getJSONArray("data"); + assertEquals("length not 1", 1, data.length()); + JSONObject authority = data.getJSONObject(0); assertEquals("", TEST_GROUPD, authority.getString("shortName")); - } - - // Search for a group (which is not in the default zone) in all zones - { - Response response = sendRequest(new GetRequest(URL_GROUPS + "?shortNameFilter=" + TEST_GROUPE ), Status.STATUS_OK); - JSONObject top = new JSONObject(response.getContentAsString()); - logger.debug(response.getContentAsString()); - //System.out.println(response.getContentAsString()); - JSONArray data = top.getJSONArray("data"); - assertEquals("length not 1", 1, data.length()); - JSONObject authority = data.getJSONObject(0); + } + + // Search for a group (which is not in the default zone) in all zones + { + Response response = sendRequest(new GetRequest(URL_GROUPS + "?shortNameFilter=" + TEST_GROUPE ), Status.STATUS_OK); + JSONObject top = new JSONObject(response.getContentAsString()); + logger.debug(response.getContentAsString()); + //System.out.println(response.getContentAsString()); + JSONArray data = top.getJSONArray("data"); + assertEquals("length not 1", 1, data.length()); + JSONObject authority = data.getJSONObject(0); assertEquals("Group E not found", TEST_GROUPE, authority.getString("shortName")); - + // Double check group E is in the share zone Set zones = authorityService.getAuthorityZones(authority.getString("fullName")); assertTrue(zones.contains(AuthorityService.ZONE_APP_SHARE)); - } - + } + //TODO TEST Case failing ? // // Search for Group E in a specific zone (without name filter) @@ -778,248 +778,248 @@ public void testSearchGroups() throws Exception // JSONObject authority = data.getJSONObject(0); // assertEquals("", TEST_GROUPE, authority.getString("shortName")); // } - - // Search for a group in a specifc non default zone - { - Response response = sendRequest(new GetRequest(URL_GROUPS + "?shortNameFilter=" + TEST_GROUPE + "&zone=" + AuthorityService.ZONE_APP_SHARE), Status.STATUS_OK); - JSONObject top = new JSONObject(response.getContentAsString()); - logger.debug(response.getContentAsString()); + + // Search for a group in a specifc non default zone + { + Response response = sendRequest(new GetRequest(URL_GROUPS + "?shortNameFilter=" + TEST_GROUPE + "&zone=" + AuthorityService.ZONE_APP_SHARE), Status.STATUS_OK); + JSONObject top = new JSONObject(response.getContentAsString()); + logger.debug(response.getContentAsString()); // System.out.println(response.getContentAsString()); - JSONArray data = top.getJSONArray("data"); - assertEquals("Can't find Group E in Share zone", 1, data.length()); - JSONObject authority = data.getJSONObject(0); + JSONArray data = top.getJSONArray("data"); + assertEquals("Can't find Group E in Share zone", 1, data.length()); + JSONObject authority = data.getJSONObject(0); assertEquals("", TEST_GROUPE, authority.getString("shortName")); - } - - // Negative test Search for a group in a wrong zone - { - Response response = sendRequest(new GetRequest(URL_GROUPS + "?shortNameFilter=" + TEST_GROUPE + "&zone=" + "SOME.THING"), Status.STATUS_OK); - JSONObject top = new JSONObject(response.getContentAsString()); - logger.debug(response.getContentAsString()); + } + + // Negative test Search for a group in a wrong zone + { + Response response = sendRequest(new GetRequest(URL_GROUPS + "?shortNameFilter=" + TEST_GROUPE + "&zone=" + "SOME.THING"), Status.STATUS_OK); + JSONObject top = new JSONObject(response.getContentAsString()); + logger.debug(response.getContentAsString()); // System.out.println(response.getContentAsString()); - JSONArray data = top.getJSONArray("data"); - assertEquals("length not 0", 0, data.length()); - } - - - } - - public void testSearchGroupsPaging() throws Exception - { - createTestTree(); - - JSONArray data = getDataArray(URL_GROUPS + "?shortNameFilter=*"); - int defaultSize = data.length(); - String firstGroup = data.get(0).toString(); - - assertTrue("There should be at least 6 groups in default zone!", defaultSize > 5); - - // Test maxItems works - data = getDataArray(URL_GROUPS + "?shortNameFilter=*" +"&maxItems=3"); - assertEquals("There should only be 3 groups!", 3, data.length()); - assertEquals("The first group should be the same!!", firstGroup, data.get(0).toString()); - - // Test skipCount works - data = getDataArray(URL_GROUPS + "?shortNameFilter=*" + "&skipCount=2"); - assertEquals("The number of groups returned is wrong!", defaultSize-2, data.length()); - assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString())); - - // Test maxItems and skipCount - data = getDataArray(URL_GROUPS + "?shortNameFilter=*" +"&skipCount=2&maxItems=3"); - assertEquals("The number of groups returned is wrong!", 3, data.length()); - assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString())); - - // Test maxItems and skipCount when maxItems is too big. - // Shoudl return last 2 items. - int skipCount = defaultSize-2; - data = getDataArray(URL_GROUPS + "?shortNameFilter=*" + "&skipCount="+skipCount+"&maxItems=5"); - assertEquals("The number of groups returned is wrong!", 2, data.length()); - assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString())); - } - - public void testGetRootGroupsPaging() throws Exception - { - createTestTree(); - - JSONArray data = getDataArray(URL_ROOTGROUPS); - int defaultSize = data.length(); - String firstGroup = data.get(0).toString(); - - assertTrue("There should be at least 3 groups in default zone!", defaultSize > 2); - - // Test maxItems works - data = getDataArray(URL_ROOTGROUPS + "?maxItems=2"); - assertEquals("There should only be 2 groups!", 2, data.length()); - assertEquals("The first group should be the same!!", firstGroup, data.get(0).toString()); - - // Test skipCount works - data = getDataArray(URL_ROOTGROUPS + "?skipCount=1"); - assertEquals("The number of groups returned is wrong!", defaultSize-1, data.length()); - assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString())); - - // Test maxItems and skipCount - data = getDataArray(URL_ROOTGROUPS + "?skipCount=1&maxItems=2"); - assertEquals("The number of groups returned is wrong!", 2, data.length()); - assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString())); - - // Test maxItems and skipCount when maxItems is too big. - // Shoudl return last 2 items. - int skipCount = defaultSize-1; - data = getDataArray(URL_ROOTGROUPS + "?skipCount="+skipCount+"&maxItems=5"); - assertEquals("The number of groups returned is wrong!", 1, data.length()); - assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString())); - } - - public void testGetParentsPaging() throws Exception - { - createTestTree(); - - // Test for immediate parents - String baseUrl = URL_GROUPS + "/" + TEST_GROUPD + "/parents"; - - JSONArray data = getDataArray(baseUrl); - int defaultSize = data.length(); - String firstGroup = data.get(0).toString(); - - assertEquals("There should be at least 3 groups in default zone!", 3, defaultSize); - - // Test maxItems works - data = getDataArray(baseUrl +"?maxItems=2"); - assertEquals("There should only be 2 groups!", 2, data.length()); - assertEquals("The first group should be the same!!", firstGroup, data.get(0).toString()); - - // Test skipCount works - data = getDataArray(baseUrl + "?skipCount=1"); - assertEquals("The number of groups returned is wrong!", 2, data.length()); - assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString())); - - // Test maxItems and skipCount - data = getDataArray(baseUrl + "?skipCount=1&maxItems=1"); - assertEquals("The number of groups returned is wrong!", 1, data.length()); - assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString())); - - // Test maxItems and skipCount when maxItems is too big. - // Should return last 2 items. - data = getDataArray(baseUrl + "?skipCount=1&maxItems=5"); - assertEquals("The number of groups returned is wrong!", 2, data.length()); - assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString())); - - //Test for ALL parents - baseUrl = URL_GROUPS + "/" + TEST_GROUPD + "/parents?level=ALL"; - - data = getDataArray(baseUrl); - defaultSize = data.length(); - firstGroup = data.get(0).toString(); - - assertTrue("There should be at least 3 groups in default zone!", defaultSize > 2); - - // Test maxItems works - data = getDataArray(baseUrl +"&maxItems=2"); - assertEquals("There should only be 2 groups!", 2, data.length()); - assertEquals("The first group should be the same!!", firstGroup, data.get(0).toString()); - - // Test skipCount works - data = getDataArray(baseUrl + "&skipCount=1"); - assertEquals("The number of groups returned is wrong!", defaultSize-1, data.length()); - assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString())); - - // Test maxItems and skipCount - data = getDataArray(baseUrl + "&skipCount=1&maxItems=2"); - assertEquals("The number of groups returned is wrong!", 2, data.length()); - assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString())); - - // Test maxItems and skipCount when maxItems is too big. - // Shoudl return last 2 items. - int skipCount = defaultSize-2; - data = getDataArray(baseUrl + "&skipCount="+skipCount+"&maxItems=5"); - assertEquals("The number of groups returned is wrong!", 2, data.length()); - assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString())); - } - - public void testGetChildGroupsPaging() throws Exception - { - createTestTree(); - - // Test for immediate parents - String baseUrl = URL_GROUPS + "/" + TEST_ROOTGROUP + "/children?authorityType=GROUP"; - - JSONArray data = getDataArray(baseUrl); - int defaultSize = data.length(); - String firstGroup = data.get(0).toString(); - - assertEquals("There should be 6 groups in default zone!", 6, defaultSize); - - // Test maxItems works - data = getDataArray(baseUrl +"&maxItems=2"); - assertEquals("There should only be 3 groups!", 2, data.length()); - assertEquals("The first group should be the same!!", firstGroup, data.get(0).toString()); - - // Test skipCount works - data = getDataArray(baseUrl + "&skipCount=2"); - assertEquals("The number of groups returned is wrong!", 4, data.length()); - assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString())); - - // Test maxItems and skipCount - data = getDataArray(baseUrl + "&skipCount=2&maxItems=2"); - assertEquals("The number of groups returned is wrong!", 2, data.length()); - assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString())); - - // Test maxItems and skipCount when maxItems is too big. - // Shoudl return last 2 items. - data = getDataArray(baseUrl + "&skipCount=4&maxItems=5"); - assertEquals("The number of groups returned is wrong!", 2, data.length()); - assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString())); - } - - private JSONArray getDataArray(String url) throws IOException, JSONException, UnsupportedEncodingException - { - Response response = sendRequest(new GetRequest(url), Status.STATUS_OK); - JSONObject top = new JSONObject(response.getContentAsString()); - JSONArray data = top.getJSONArray("data"); - return data; - } - /** - * Detailed test of get Parents - */ - public void testGetParents() throws Exception - { - createTestTree(); - - /** - * Get all parents for the root group ALFRESCO_ADMINISTRATORS groups which has no parents - */ - { - Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + ADMIN_GROUP + "/parents"), Status.STATUS_OK); - JSONObject top = new JSONObject(response.getContentAsString()); - logger.debug(response.getContentAsString()); - JSONArray data = top.getJSONArray("data"); - // Top level group has no parents - assertTrue("top level group has no parents", data.length() == 0); - } - - /** - * Get GROUP B Which should be a child of TESTROOT - */ - { - Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + TEST_GROUPB + "/parents"), Status.STATUS_OK); - JSONObject top = new JSONObject(response.getContentAsString()); - logger.debug(response.getContentAsString()); - JSONArray data = top.getJSONArray("data"); - assertTrue(data.length() > 0); - } - - /** - * Get GROUP D Which should be a child of GROUPB child of TESTROOT - */ - { - Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + TEST_GROUPD + "/parents?level=ALL"), Status.STATUS_OK); - JSONObject top = new JSONObject(response.getContentAsString()); - logger.debug(response.getContentAsString()); - JSONArray data = top.getJSONArray("data"); - assertTrue(data.length() >= 2); - } - -// TODO parents script does not have zone parameter + JSONArray data = top.getJSONArray("data"); + assertEquals("length not 0", 0, data.length()); + } + + + } + + public void testSearchGroupsPaging() throws Exception + { + createTestTree(); + + JSONArray data = getDataArray(URL_GROUPS + "?shortNameFilter=*"); + int defaultSize = data.length(); + String firstGroup = data.get(0).toString(); + + assertTrue("There should be at least 6 groups in default zone!", defaultSize > 5); + + // Test maxItems works + data = getDataArray(URL_GROUPS + "?shortNameFilter=*" +"&maxItems=3"); + assertEquals("There should only be 3 groups!", 3, data.length()); + assertEquals("The first group should be the same!!", firstGroup, data.get(0).toString()); + + // Test skipCount works + data = getDataArray(URL_GROUPS + "?shortNameFilter=*" + "&skipCount=2"); + assertEquals("The number of groups returned is wrong!", defaultSize-2, data.length()); + assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString())); + + // Test maxItems and skipCount + data = getDataArray(URL_GROUPS + "?shortNameFilter=*" +"&skipCount=2&maxItems=3"); + assertEquals("The number of groups returned is wrong!", 3, data.length()); + assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString())); + + // Test maxItems and skipCount when maxItems is too big. + // Shoudl return last 2 items. + int skipCount = defaultSize-2; + data = getDataArray(URL_GROUPS + "?shortNameFilter=*" + "&skipCount="+skipCount+"&maxItems=5"); + assertEquals("The number of groups returned is wrong!", 2, data.length()); + assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString())); + } + + public void testGetRootGroupsPaging() throws Exception + { + createTestTree(); + + JSONArray data = getDataArray(URL_ROOTGROUPS); + int defaultSize = data.length(); + String firstGroup = data.get(0).toString(); + + assertTrue("There should be at least 3 groups in default zone!", defaultSize > 2); + + // Test maxItems works + data = getDataArray(URL_ROOTGROUPS + "?maxItems=2"); + assertEquals("There should only be 2 groups!", 2, data.length()); + assertEquals("The first group should be the same!!", firstGroup, data.get(0).toString()); + + // Test skipCount works + data = getDataArray(URL_ROOTGROUPS + "?skipCount=1"); + assertEquals("The number of groups returned is wrong!", defaultSize-1, data.length()); + assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString())); + + // Test maxItems and skipCount + data = getDataArray(URL_ROOTGROUPS + "?skipCount=1&maxItems=2"); + assertEquals("The number of groups returned is wrong!", 2, data.length()); + assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString())); + + // Test maxItems and skipCount when maxItems is too big. + // Shoudl return last 2 items. + int skipCount = defaultSize-1; + data = getDataArray(URL_ROOTGROUPS + "?skipCount="+skipCount+"&maxItems=5"); + assertEquals("The number of groups returned is wrong!", 1, data.length()); + assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString())); + } + + public void testGetParentsPaging() throws Exception + { + createTestTree(); + + // Test for immediate parents + String baseUrl = URL_GROUPS + "/" + TEST_GROUPD + "/parents"; + + JSONArray data = getDataArray(baseUrl); + int defaultSize = data.length(); + String firstGroup = data.get(0).toString(); + + assertEquals("There should be at least 3 groups in default zone!", 3, defaultSize); + + // Test maxItems works + data = getDataArray(baseUrl +"?maxItems=2"); + assertEquals("There should only be 2 groups!", 2, data.length()); + assertEquals("The first group should be the same!!", firstGroup, data.get(0).toString()); + + // Test skipCount works + data = getDataArray(baseUrl + "?skipCount=1"); + assertEquals("The number of groups returned is wrong!", 2, data.length()); + assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString())); + + // Test maxItems and skipCount + data = getDataArray(baseUrl + "?skipCount=1&maxItems=1"); + assertEquals("The number of groups returned is wrong!", 1, data.length()); + assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString())); + + // Test maxItems and skipCount when maxItems is too big. + // Should return last 2 items. + data = getDataArray(baseUrl + "?skipCount=1&maxItems=5"); + assertEquals("The number of groups returned is wrong!", 2, data.length()); + assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString())); + + //Test for ALL parents + baseUrl = URL_GROUPS + "/" + TEST_GROUPD + "/parents?level=ALL"; + + data = getDataArray(baseUrl); + defaultSize = data.length(); + firstGroup = data.get(0).toString(); + + assertTrue("There should be at least 3 groups in default zone!", defaultSize > 2); + + // Test maxItems works + data = getDataArray(baseUrl +"&maxItems=2"); + assertEquals("There should only be 2 groups!", 2, data.length()); + assertEquals("The first group should be the same!!", firstGroup, data.get(0).toString()); + + // Test skipCount works + data = getDataArray(baseUrl + "&skipCount=1"); + assertEquals("The number of groups returned is wrong!", defaultSize-1, data.length()); + assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString())); + + // Test maxItems and skipCount + data = getDataArray(baseUrl + "&skipCount=1&maxItems=2"); + assertEquals("The number of groups returned is wrong!", 2, data.length()); + assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString())); + + // Test maxItems and skipCount when maxItems is too big. + // Shoudl return last 2 items. + int skipCount = defaultSize-2; + data = getDataArray(baseUrl + "&skipCount="+skipCount+"&maxItems=5"); + assertEquals("The number of groups returned is wrong!", 2, data.length()); + assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString())); + } + + public void testGetChildGroupsPaging() throws Exception + { + createTestTree(); + + // Test for immediate parents + String baseUrl = URL_GROUPS + "/" + TEST_ROOTGROUP + "/children?authorityType=GROUP"; + + JSONArray data = getDataArray(baseUrl); + int defaultSize = data.length(); + String firstGroup = data.get(0).toString(); + + assertEquals("There should be 6 groups in default zone!", 6, defaultSize); + + // Test maxItems works + data = getDataArray(baseUrl +"&maxItems=2"); + assertEquals("There should only be 3 groups!", 2, data.length()); + assertEquals("The first group should be the same!!", firstGroup, data.get(0).toString()); + + // Test skipCount works + data = getDataArray(baseUrl + "&skipCount=2"); + assertEquals("The number of groups returned is wrong!", 4, data.length()); + assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString())); + + // Test maxItems and skipCount + data = getDataArray(baseUrl + "&skipCount=2&maxItems=2"); + assertEquals("The number of groups returned is wrong!", 2, data.length()); + assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString())); + + // Test maxItems and skipCount when maxItems is too big. + // Shoudl return last 2 items. + data = getDataArray(baseUrl + "&skipCount=4&maxItems=5"); + assertEquals("The number of groups returned is wrong!", 2, data.length()); + assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString())); + } + + private JSONArray getDataArray(String url) throws IOException, JSONException, UnsupportedEncodingException + { + Response response = sendRequest(new GetRequest(url), Status.STATUS_OK); + JSONObject top = new JSONObject(response.getContentAsString()); + JSONArray data = top.getJSONArray("data"); + return data; + } + /** + * Detailed test of get Parents + */ + public void testGetParents() throws Exception + { + createTestTree(); + + /** + * Get all parents for the root group ALFRESCO_ADMINISTRATORS groups which has no parents + */ + { + Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + ADMIN_GROUP + "/parents"), Status.STATUS_OK); + JSONObject top = new JSONObject(response.getContentAsString()); + logger.debug(response.getContentAsString()); + JSONArray data = top.getJSONArray("data"); + // Top level group has no parents + assertTrue("top level group has no parents", data.length() == 0); + } + + /** + * Get GROUP B Which should be a child of TESTROOT + */ + { + Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + TEST_GROUPB + "/parents"), Status.STATUS_OK); + JSONObject top = new JSONObject(response.getContentAsString()); + logger.debug(response.getContentAsString()); + JSONArray data = top.getJSONArray("data"); + assertTrue(data.length() > 0); + } + + /** + * Get GROUP D Which should be a child of GROUPB child of TESTROOT + */ + { + Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + TEST_GROUPD + "/parents?level=ALL"), Status.STATUS_OK); + JSONObject top = new JSONObject(response.getContentAsString()); + logger.debug(response.getContentAsString()); + JSONArray data = top.getJSONArray("data"); + assertTrue(data.length() >= 2); + } + +// TODO parents script does not have zone parameter // /** // * Get GROUP E Which should be a child of GROUPB child of TESTROOT but in a different zone // */ @@ -1030,142 +1030,142 @@ public void testGetParents() throws Exception // JSONArray data = top.getJSONArray("data"); // assertTrue(data.length() >= 2); // } - - /** - * Negative test Get GROUP D level="rubbish" - */ - { - sendRequest(new GetRequest(URL_GROUPS + "/" + TEST_GROUPD + "/parents?level=rubbish"), Status.STATUS_BAD_REQUEST); - } - - /** - * Negative test GROUP(Rubbish) does not exist - */ - { - sendRequest(new GetRequest(URL_GROUPS + "/" + "rubbish" + "/parents?level=all"), Status.STATUS_NOT_FOUND); - - } - } - - /** - * Detailed test of get Children - */ - public void testGetChildren() throws Exception - { - createTestTree(); - - /** - * Get All Children of GROUP B - */ - { - logger.debug("Get all children of GROUP B"); - Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + TEST_GROUPB + "/children"), Status.STATUS_OK); - JSONObject top = new JSONObject(response.getContentAsString()); - logger.debug(response.getContentAsString()); - JSONArray data = top.getJSONArray("data"); - assertTrue(data.length() > 0); - boolean gotGroupD = false; - boolean gotGroupE = false; - boolean gotUserTwo = false; - boolean gotUserThree = false; - for(int i = 0; i < data.length(); i++) - { - JSONObject authority = data.getJSONObject(i); - if(authority.getString("shortName").equals(TEST_GROUPD)) - { - gotGroupD = true; - } - if(authority.getString("shortName").equals(TEST_GROUPE)) - { - gotGroupE = true; - } - if(authority.getString("shortName").equals(USER_TWO)) - { - gotUserTwo = true; - } - if(authority.getString("shortName").equals(USER_THREE)) - { - gotUserThree = true; - } - } - assertEquals("4 groups not returned", 4, data.length()); - assertTrue("not got group D", gotGroupD); - assertTrue("not got group E", gotGroupE); - assertTrue("not got user two", gotUserTwo); - assertTrue("not got user three", gotUserThree); - - } - - /** - * Get All Children of GROUP B which are GROUPS - */ - { - logger.debug("Get child GROUPS of GROUP B"); - Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + TEST_GROUPB + "/children?authorityType=GROUP"), Status.STATUS_OK); - JSONObject top = new JSONObject(response.getContentAsString()); - logger.debug(response.getContentAsString()); - JSONArray data = top.getJSONArray("data"); - assertTrue("no child groups of group B", data.length() > 1 ); - - boolean gotGroupD = false; - boolean gotGroupE = false; - JSONObject subGroup = data.getJSONObject(0); - for(int i = 0; i < data.length(); i++) - { - JSONObject authority = data.getJSONObject(i); - if(authority.getString("shortName").equals(TEST_GROUPD)) - { - gotGroupD = true; - } - else if(authority.getString("shortName").equals(TEST_GROUPE)) - { - gotGroupE = true; - } - else - { - fail("unexpected authority returned:" + authority.getString("shortName")); - } - } - assertTrue("not got group D", gotGroupD); - assertTrue("not got group E", gotGroupE); - - assertEquals("authorityType wrong", "GROUP", subGroup.getString("authorityType")); - for(int i = 0; i < data.length(); i++) - { - JSONObject authority = data.getJSONObject(i); - assertEquals("authorityType wrong", "GROUP", authority.getString("authorityType")); - } - } - - /** - * Get All Children of GROUP B which are USERS - */ - { - logger.debug("Get Child Users of Group B"); - Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + TEST_GROUPB + "/children?authorityType=USER"), Status.STATUS_OK); - JSONObject top = new JSONObject(response.getContentAsString()); - logger.debug(response.getContentAsString()); - JSONArray data = top.getJSONArray("data"); - assertTrue(data.length() > 1); - for(int i = 0; i < data.length(); i++) - { - JSONObject authority = data.getJSONObject(i); - assertEquals("authorityType wrong", "USER", authority.getString("authorityType")); - } - } - - /** - * Negative test All Children of GROUP B, bad authorityType - */ - { - sendRequest(new GetRequest(URL_GROUPS + "/" + TEST_GROUPB + "/children?authorityType=XXX"), Status.STATUS_BAD_REQUEST); - } - - /** - * Negative test GROUP(Rubbish) does not exist - */ - { - sendRequest(new GetRequest(URL_GROUPS + "/" + "rubbish" + "/children"), Status.STATUS_NOT_FOUND); - } - } -} \ No newline at end of file + + /** + * Negative test Get GROUP D level="rubbish" + */ + { + sendRequest(new GetRequest(URL_GROUPS + "/" + TEST_GROUPD + "/parents?level=rubbish"), Status.STATUS_BAD_REQUEST); + } + + /** + * Negative test GROUP(Rubbish) does not exist + */ + { + sendRequest(new GetRequest(URL_GROUPS + "/" + "rubbish" + "/parents?level=all"), Status.STATUS_NOT_FOUND); + + } + } + + /** + * Detailed test of get Children + */ + public void testGetChildren() throws Exception + { + createTestTree(); + + /** + * Get All Children of GROUP B + */ + { + logger.debug("Get all children of GROUP B"); + Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + TEST_GROUPB + "/children"), Status.STATUS_OK); + JSONObject top = new JSONObject(response.getContentAsString()); + logger.debug(response.getContentAsString()); + JSONArray data = top.getJSONArray("data"); + assertTrue(data.length() > 0); + boolean gotGroupD = false; + boolean gotGroupE = false; + boolean gotUserTwo = false; + boolean gotUserThree = false; + for(int i = 0; i < data.length(); i++) + { + JSONObject authority = data.getJSONObject(i); + if(authority.getString("shortName").equals(TEST_GROUPD)) + { + gotGroupD = true; + } + if(authority.getString("shortName").equals(TEST_GROUPE)) + { + gotGroupE = true; + } + if(authority.getString("shortName").equals(USER_TWO)) + { + gotUserTwo = true; + } + if(authority.getString("shortName").equals(USER_THREE)) + { + gotUserThree = true; + } + } + assertEquals("4 groups not returned", 4, data.length()); + assertTrue("not got group D", gotGroupD); + assertTrue("not got group E", gotGroupE); + assertTrue("not got user two", gotUserTwo); + assertTrue("not got user three", gotUserThree); + + } + + /** + * Get All Children of GROUP B which are GROUPS + */ + { + logger.debug("Get child GROUPS of GROUP B"); + Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + TEST_GROUPB + "/children?authorityType=GROUP"), Status.STATUS_OK); + JSONObject top = new JSONObject(response.getContentAsString()); + logger.debug(response.getContentAsString()); + JSONArray data = top.getJSONArray("data"); + assertTrue("no child groups of group B", data.length() > 1 ); + + boolean gotGroupD = false; + boolean gotGroupE = false; + JSONObject subGroup = data.getJSONObject(0); + for(int i = 0; i < data.length(); i++) + { + JSONObject authority = data.getJSONObject(i); + if(authority.getString("shortName").equals(TEST_GROUPD)) + { + gotGroupD = true; + } + else if(authority.getString("shortName").equals(TEST_GROUPE)) + { + gotGroupE = true; + } + else + { + fail("unexpected authority returned:" + authority.getString("shortName")); + } + } + assertTrue("not got group D", gotGroupD); + assertTrue("not got group E", gotGroupE); + + assertEquals("authorityType wrong", "GROUP", subGroup.getString("authorityType")); + for(int i = 0; i < data.length(); i++) + { + JSONObject authority = data.getJSONObject(i); + assertEquals("authorityType wrong", "GROUP", authority.getString("authorityType")); + } + } + + /** + * Get All Children of GROUP B which are USERS + */ + { + logger.debug("Get Child Users of Group B"); + Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + TEST_GROUPB + "/children?authorityType=USER"), Status.STATUS_OK); + JSONObject top = new JSONObject(response.getContentAsString()); + logger.debug(response.getContentAsString()); + JSONArray data = top.getJSONArray("data"); + assertTrue(data.length() > 1); + for(int i = 0; i < data.length(); i++) + { + JSONObject authority = data.getJSONObject(i); + assertEquals("authorityType wrong", "USER", authority.getString("authorityType")); + } + } + + /** + * Negative test All Children of GROUP B, bad authorityType + */ + { + sendRequest(new GetRequest(URL_GROUPS + "/" + TEST_GROUPB + "/children?authorityType=XXX"), Status.STATUS_BAD_REQUEST); + } + + /** + * Negative test GROUP(Rubbish) does not exist + */ + { + sendRequest(new GetRequest(URL_GROUPS + "/" + "rubbish" + "/children"), Status.STATUS_NOT_FOUND); + } + } +} diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/GroupsTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/GroupsTest.java index 29a5ed46b756..4d28bb07e614 100644 --- a/remote-api/src/test/java/org/alfresco/rest/api/tests/GroupsTest.java +++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/GroupsTest.java @@ -51,7 +51,11 @@ import jakarta.servlet.http.HttpServletResponse; import java.util.*; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.when; /** @@ -67,13 +71,13 @@ public class GroupsTest extends AbstractSingleNetworkSiteTest protected AuthorityService authorityService; - private String rootGroupName = null; - private Group rootGroup = null; - private Group groupA = null; - private Group groupB = null; - private GroupMember groupMemberA = null; - private GroupMember groupMemberB = null; - private GroupMember personMember = null; + private String rootGroupName; + private Group rootGroup; + private Group groupA; + private Group groupB; + private GroupMember groupMemberA; + private GroupMember groupMemberB; + private GroupMember personMember; @Mock private ResultSetRow groupAResultSetRow; @Mock @@ -955,7 +959,7 @@ private void canGetGroupsForUserId() throws Exception expected.retainAll(respPostProcess.getList()); // If this assertion fails, then the tests aren't providing any value - change them! - assertTrue("List doesn't contain enough items for test to be conclusive.", expected.size() > 0); + assertTrue("List doesn't contain enough items for test to be conclusive.", !expected.isEmpty()); checkList(expected, respPostProcess.getPaging(), respPostProcess); } @@ -976,7 +980,7 @@ private void canGetGroupsForUserId() throws Exception expected.retainAll(respPostProcess.getList()); // If this assertion fails, then the tests aren't providing any value - change them! - assertTrue("List doesn't contain enough items for test to be conclusive.", expected.size() > 0); + assertTrue("List doesn't contain enough items for test to be conclusive.", !expected.isEmpty()); checkList(expected, respPostProcess.getPaging(), respPostProcess); } @@ -1153,7 +1157,6 @@ private void canGetGroupsForUserId() throws Exception // -ve test: invalid zones clause { - Paging paging = getPaging(0, Integer.MAX_VALUE); Map otherParams = new HashMap<>(); otherParams.put("include", org.alfresco.rest.api.Groups.PARAM_INCLUDE_ZONES);