libre.sh/keycloak-scim
4
0
Fork 0
Code Issues 15 Pull requests Releases 1 Activity Actions

KEYCLOAK 2538 - UI group pagination - Remove junit mocked TUs, add arquillian Tests, delete mockito from poms, fix groups sorting when get result from cache

Browse source
This commit is contained in:
Levente NAGY 2017-09-13 16:45:45 +02:00
parent c8c88dd58c
commit e907da77d7
11 changed files with 95 additions and 503 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupsResource.java
View file

@ -24,6 +24,7 @@ import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import java.util.List;
import java.util.Map;
/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
@ -69,39 +70,38 @@ public interface GroupsResource {
/**
* Counts all groups.
* @return The number of groups.
* @return A map containing key "count" with number of groups as value.
*/
@GET
@NoCache
@Path("/count")
@Path("count")
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
Response count();
Map<String, Long> count();
/**
* Counts groups by name search.
* @param search max number of occurrences
* @return The number of group containing search therm.
* @return A map containing key "count" with number of groups as value which matching with search.
*/
@GET
@NoCache
@Path("/count")
@Path("count")
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
Response count(@QueryParam("search") String search);
Map<String, Long> count(@QueryParam("search") String search);
/**
* Counts groups by name search.
* @param search max number of occurrences
* @param onlyTopGroups <code>true</code> or <code>false</code> for filter only top level groups count
* @return The number of group containing search therm.
* @return A map containing key "count" with number of top level groups.
*/
@GET
@NoCache
@Path("/count")
@Path("count")
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
Response count(@QueryParam("search") String search, @QueryParam("top") String onlyTopGroups);
Map<String, Long> count(@QueryParam("top") @DefaultValue("true") boolean onlyTopGroups);
/**
* create or add a top level realm groupSet or create child. This will update the group and set the parent if it exists. Create it and set the parent

18
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/RealmCacheSession.java vendored
View file

@ -94,7 +94,6 @@ public class RealmCacheSession implements CacheRealmProvider {
protected static final Logger logger = Logger.getLogger(RealmCacheSession.class);
public static final String REALM_CLIENTS_QUERY_SUFFIX = ".realm.clients";
public static final String ROLES_QUERY_SUFFIX = ".roles";
public static final String ROLE_BY_NAME_QUERY_SUFFIX = ".role.by-name";
protected RealmCacheManager cache;
protected KeycloakSession session;
protected RealmProvider delegate;
@ -839,6 +838,9 @@ public class RealmCacheSession implements CacheRealmProvider {
}
list.add(group);
}
list.sort(Comparator.comparing(GroupModel::getName));
return list;
}
@ -885,6 +887,9 @@ public class RealmCacheSession implements CacheRealmProvider {
}
list.add(group);
}
list.sort(Comparator.comparing(GroupModel::getName));
return list;
}
@ -921,6 +926,9 @@ public class RealmCacheSession implements CacheRealmProvider {
}
list.add(group);
}
list.sort(Comparator.comparing(GroupModel::getName));
return list;
}
@ -980,11 +988,9 @@ public class RealmCacheSession implements CacheRealmProvider {
String groupId = eventToAdd.getId();
// Check if we have existing event with bigger priority
boolean eventAlreadyExists = invalidationEvents.stream().filter((InvalidationEvent event) -> {
return (event.getId().equals(groupId)) && (event instanceof GroupAddedEvent || event instanceof GroupMovedEvent || event instanceof GroupRemovedEvent);
}).findFirst().isPresent();
boolean eventAlreadyExists = invalidationEvents.stream()
.anyMatch((InvalidationEvent event) -> (event.getId().equals(groupId)) &&
(event instanceof GroupAddedEvent || event instanceof GroupMovedEvent || event instanceof GroupRemovedEvent));
if (!eventAlreadyExists) {
invalidationEvents.add(eventToAdd);

5
model/jpa/pom.xml
View file

@ -111,11 +111,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>

218
model/jpa/src/test/java/org/keycloak/models/jpa/JpaRealmProviderTest.java
View file

@ -1,218 +0,0 @@
/*
* Copyright 2016 Red Hat, Inc. and/or its affiliates
* and other contributors as indicated by the @author tags.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.keycloak.models.jpa;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.keycloak.models.GroupModel;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.RealmModel;
import org.keycloak.models.RealmProvider;
import org.keycloak.models.jpa.entities.GroupEntity;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.stubbing.Answer;
import javax.persistence.EntityManager;
import javax.persistence.Query;
import javax.persistence.TypedQuery;
import java.util.*;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.*;
/**
* @author <a href="mailto:levente.nagy@itesoft.com">NAGY Léventé</a>
* @version $Revision: 1 $
*/
@RunWith(MockitoJUnitRunner.class)
public class JpaRealmProviderTest {
private JpaRealmProvider subject;
private RealmModel realmModelMock;
private RealmProvider realmProviderMock;
private KeycloakSession sessionMock;
private EntityManager entityManagerMock;
@Before
public void setup() {
realmModelMock = mock(RealmModel.class);
realmProviderMock = mock(RealmProvider.class);
sessionMock = mock(KeycloakSession.class);
entityManagerMock = mock(EntityManager.class);
subject = new JpaRealmProvider(sessionMock, entityManagerMock);
// Common behaviours
when(realmProviderMock.getGroupById(anyString(), any(RealmModel.class))).thenAnswer((Answer<GroupModel>) invocationOnMock -> {
GroupEntity entity = new GroupEntity();
entity.setId((String) invocationOnMock.getArguments()[0]);
entity.setName((String) invocationOnMock.getArguments()[0]);
return new GroupAdapter(realmModelMock, entityManagerMock, entity);
});
}
@Test
public void testGetGroupsCountAllGroups() {
// Given
Long result = 10L;
String idRealm = "idGroup";
TypedQuery<Long> query = mock(TypedQuery.class);
// When
when(entityManagerMock.createNamedQuery("getGroupCount", Long.class)).thenReturn(query);
when(realmModelMock.getId()).thenReturn(idRealm);
when(query.setParameter("realm", idRealm)).thenReturn(query);
when(query.getSingleResult()).thenReturn(result);
// Then
Long countResult = subject.getGroupsCount(realmModelMock, false);
assertEquals(result, countResult);
}
@Test
public void testGetGroupsCountOnlyTopLevelGroups() {
// Given
Long result = 10L;
String idRealm = "idGroup";
TypedQuery<Long> query = mock(TypedQuery.class);
// When
when(entityManagerMock.createNamedQuery("getTopLevelGroupCount", Long.class)).thenReturn(query);
when(realmModelMock.getId()).thenReturn(idRealm);
when(query.setParameter("realm", idRealm)).thenReturn(query);
when(query.getSingleResult()).thenReturn(result);
// Then
Long countResult = subject.getGroupsCount(realmModelMock, true);
assertEquals(result, countResult);
}
@Test
public void testSearchForGroupByNameWithAllParams() {
// Given
List<String> result = Arrays.asList("idGroup1", "idGroup2", "idGroup3");
String idRealm = "idGroup";
TypedQuery<String> query = mock(TypedQuery.class);
String search = "findMe";
Integer first = 0;
Integer max = 10;
// When
when(entityManagerMock.createNamedQuery("getGroupIdsByNameContaining", String.class)).thenReturn(query);
when(realmModelMock.getId()).thenReturn(idRealm);
when(query.setParameter("realm", idRealm)).thenReturn(query);
when(query.setParameter("search", search)).thenReturn(query);
when(query.setFirstResult(first)).thenReturn(query);
when(query.setMaxResults(max)).thenReturn(query);
when(query.getResultList()).thenReturn(result);
when(sessionMock.realms()).thenReturn(realmProviderMock);
// Then
List<GroupModel> searchResult = subject.searchForGroupByName(realmModelMock, search, first, max);
assertEquals(result.size(), searchResult.size());
}
@Test
public void testSearchForGroupByNameWithNullQueryResult() {
// Given
String idRealm = "idGroup";
TypedQuery<String> query = mock(TypedQuery.class);
String search = "findMe";
// When
when(entityManagerMock.createNamedQuery("getGroupIdsByNameContaining", String.class)).thenReturn(query);
when(realmModelMock.getId()).thenReturn(idRealm);
when(query.setParameter("realm", idRealm)).thenReturn(query);
when(query.setParameter("search", search)).thenReturn(query);
when(query.getResultList()).thenReturn(null);
when(sessionMock.realms()).thenReturn(realmProviderMock);
// Then
List<GroupModel> searchResult = subject.searchForGroupByName(realmModelMock, search, null, null);
assertEquals(Collections.EMPTY_LIST, searchResult);
}
@Test
public void testSearchForGroupByNameWithNonTopLevelGroupInQueryResult() {
// Given
List<String> result = Arrays.asList("idGroup1", "idGroup2", "idGroup3", "idGroup4");
String idRealm = "idGroup";
TypedQuery<String> query = mock(TypedQuery.class);
String search = "findMe";
Integer first = 0;
Integer max = 10;
// When
when(entityManagerMock.createNamedQuery("getGroupIdsByNameContaining", String.class)).thenReturn(query);
when(realmModelMock.getId()).thenReturn(idRealm);
when(query.setParameter("realm", idRealm)).thenReturn(query);
when(query.setParameter("search", search)).thenReturn(query);
when(query.setFirstResult(first)).thenReturn(query);
when(query.setMaxResults(max)).thenReturn(query);
when(query.getResultList()).thenReturn(result);
when(sessionMock.realms()).thenReturn(realmProviderMock);
when(realmProviderMock.getGroupById(anyString(), any(RealmModel.class))).thenAnswer((Answer<GroupModel>) invocationOnMock -> {
GroupEntity entity = new GroupEntity();
entity.setId((String) invocationOnMock.getArguments()[0]);
entity.setName((String) invocationOnMock.getArguments()[0]);
if(Arrays.asList("idGroup2", "idGroup4").contains(invocationOnMock.getArguments()[0])) {
entity.setParent(new GroupEntity());
entity.getParent().setId("idGroup5");
entity.getParent().setName("idGroup5");
}
return new GroupAdapter(realmModelMock, entityManagerMock, entity);
});
// Then
List<GroupModel> searchResult = subject.searchForGroupByName(realmModelMock, search, first, max);
assertEquals(3,searchResult.size());
}
@Test
public void testGetGroupsCountByNameContaining() {
// Given
List<String> result = Arrays.asList("idGroup1", "idGroup2", "idGroup3", "idGroup4");
String idRealm = "idGroup";
TypedQuery<String> query = mock(TypedQuery.class);
String search = "findMe";
// When
when(entityManagerMock.createNamedQuery("getGroupIdsByNameContaining", String.class)).thenReturn(query);
when(realmModelMock.getId()).thenReturn(idRealm);
when(query.setParameter("realm", idRealm)).thenReturn(query);
when(query.setParameter("search", search)).thenReturn(query);
when(query.getResultList()).thenReturn(result);
when(sessionMock.realms()).thenReturn(realmProviderMock);
// Then
Long countResult = subject.getGroupsCountByNameContaining(realmModelMock, search);
verify(query, never()).setFirstResult(anyInt());
verify(query, never()).setFirstResult(anyInt());
assertEquals(result.size(), countResult.intValue());
}
}

7
pom.xml
View file

@ -108,7 +108,6 @@
<hamcrest.version>1.3</hamcrest.version>
<jmeter.version>2.10</jmeter.version>
<junit.version>4.12</junit.version>
<mockito.version>1.9.5</mockito.version>
<picketlink.version>2.7.0.Final</picketlink.version>
<selenium.version>2.35.0</selenium.version>
<xml-apis.version>1.4.01</xml-apis.version>
@ -368,12 +367,6 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<scope>test</scope>
<version>${mockito.version}</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>

5
services/pom.xml
View file

@ -180,11 +180,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>

19
services/src/main/java/org/keycloak/services/resources/admin/GroupsResource.java
View file

@ -35,7 +35,9 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import java.net.URI;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import org.keycloak.services.ErrorResponse;
import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator;
@ -113,22 +115,19 @@ public class GroupsResource {
*/
@GET
@NoCache
@Path("/count")
@Path("count")
@Produces(MediaType.APPLICATION_JSON)
public Response getGroupCount(@QueryParam("search") String search, @QueryParam("top") String onlyTopGroups) {
public Map<String, Long> getGroupCount(@QueryParam("search") String search,
@QueryParam("top") @DefaultValue("false") boolean onlyTopGroups) {
Long results;
JSONObject response = new JSONObject();
Map<String, Long> map = new HashMap<>();
if (Objects.nonNull(search)) {
results = realm.getGroupsCountByNameContaining(search);
} else {
results = realm.getGroupsCount(Objects.equals(onlyTopGroups, Boolean.TRUE.toString()));
results = realm.getGroupsCount(onlyTopGroups);
}
try {
response.put("count", results);
} catch (JSONException e) {
return ErrorResponse.error("Cannot create response object", Response.Status.INTERNAL_SERVER_ERROR);
}
return Response.ok(response.toString(), MediaType.APPLICATION_JSON).build();
map.put("count", results);
return map;
}
/**

230
services/src/test/java/org/keycloak/services/resources/admin/GroupsResourceTest.java
View file

@ -1,230 +0,0 @@
/*
* Copyright 2016 Red Hat, Inc. and/or its affiliates
* and other contributors as indicated by the @author tags.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.keycloak.services.resources.admin;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.keycloak.events.admin.ResourceType;
import org.keycloak.models.GroupModel;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.RealmModel;
import org.keycloak.representations.idm.GroupRepresentation;
import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator;
import org.keycloak.services.resources.admin.permissions.GroupPermissionEvaluator;
import twitter4j.JSONException;
import twitter4j.JSONObject;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import java.util.Collections;
import java.util.List;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
* @author <a href="mailto:levente.nagy@itesoft.com">NAGY Léventé</a>
* @version $Revision: 1 $
*/
public class GroupsResourceTest {
private GroupsResource subject;
private RealmModel realmMock;
private KeycloakSession sessionMock;
private AdminPermissionEvaluator authMock;
private AdminEventBuilder adminEventBuilderMock;
@Before
public void setup() {
realmMock = mock(RealmModel.class);
sessionMock = mock(KeycloakSession.class);
authMock = mock(AdminPermissionEvaluator.class);
when(authMock.groups()).thenReturn(mock(GroupPermissionEvaluator.class));
adminEventBuilderMock = mock(AdminEventBuilder.class);
when(adminEventBuilderMock.resource(ResourceType.GROUP)).thenReturn(adminEventBuilderMock);
subject= new GroupsResource(realmMock, sessionMock, authMock, adminEventBuilderMock);
}
@Test
public void testGetGroupWithAllParams() {
// Given
String search = "hello";
Integer first = 0;
Integer max = 20;
String groupId = "groupId";
String groupName = "groupName";
GroupModel groupMock = mock(GroupModel.class);
List<GroupModel> groupsList = Collections.singletonList(groupMock);
// When
when(realmMock.searchForGroupByName(search, first, max)).thenReturn(groupsList);
when(groupMock.getSubGroups()).thenReturn(Collections.EMPTY_SET);
when(groupMock.getId()).thenReturn(groupId);
when(groupMock.getName()).thenReturn(groupName);
when(groupMock.getParent()).thenReturn(null);
//Then
List<GroupRepresentation> result = subject.getGroups(search, first,max);
Assert.assertEquals(groupsList.size(), result.size());
Assert.assertEquals(groupId, result.get(0).getId());
Assert.assertEquals(groupName, result.get(0).getName());
Assert.assertTrue(result.get(0).getSubGroups().isEmpty());
}
@Test
public void testGetGroupWithoutSearch() {
// Given
Integer first = 0;
Integer max = 20;
String groupId = "groupId";
String groupName = "groupName";
GroupModel groupMock = mock(GroupModel.class);
List<GroupModel> groupsList = Collections.singletonList(groupMock);
// When
when(realmMock.getTopLevelGroups(first, max)).thenReturn(groupsList);
when(groupMock.getSubGroups()).thenReturn(Collections.EMPTY_SET);
when(groupMock.getId()).thenReturn(groupId);
when(groupMock.getName()).thenReturn(groupName);
when(groupMock.getParent()).thenReturn(null);
//Then
List<GroupRepresentation> result = subject.getGroups(null, first,max);
Assert.assertEquals(groupsList.size(), result.size());
Assert.assertEquals(groupId, result.get(0).getId());
Assert.assertEquals(groupName, result.get(0).getName());
Assert.assertTrue(result.get(0).getSubGroups().isEmpty());
}
@Test
public void testGetGroupWithoutSearchAndPagination() {
// Given
String groupId = "groupId";
String groupName = "groupName";
GroupModel groupMock = mock(GroupModel.class);
List<GroupModel> groupsList = Collections.singletonList(groupMock);
// When
when(realmMock.getTopLevelGroups()).thenReturn(groupsList);
when(groupMock.getSubGroups()).thenReturn(Collections.EMPTY_SET);
when(groupMock.getId()).thenReturn(groupId);
when(groupMock.getName()).thenReturn(groupName);
when(groupMock.getParent()).thenReturn(null);
//Then
List<GroupRepresentation> result = subject.getGroups(null, null, null);
Assert.assertEquals(groupsList.size(), result.size());
Assert.assertEquals(groupId, result.get(0).getId());
Assert.assertEquals(groupName, result.get(0).getName());
Assert.assertTrue(result.get(0).getSubGroups().isEmpty());
}
@Test
public void testGetGroupCountWithSearchAndTopLevelFlagTrue() {
// Given
String search = "search";
Long countResult = 5L;
JSONObject response = new JSONObject();
try {
response.put("count", countResult);
} catch (JSONException e) {
fail(e.getMessage());
}
// When
when(realmMock.getGroupsCountByNameContaining(search)).thenReturn(countResult);
//Then
Response restResponse = subject.getGroupCount(search, "true");
assertEquals(response.toString(), restResponse.getEntity());
assertEquals(MediaType.APPLICATION_JSON, restResponse.getMediaType().toString());
}
@Test
public void testGetGroupCountWithoutSearchAndTopLevelFlagTrue() {
// Given
Long countResult = 5L;
JSONObject response = new JSONObject();
try {
response.put("count", countResult);
} catch (JSONException e) {
fail(e.getMessage());
}
// When
when(realmMock.getGroupsCount(true)).thenReturn(countResult);
//Then
Response restResponse = subject.getGroupCount(null, "true");
assertEquals(response.toString(), restResponse.getEntity());
assertEquals(MediaType.APPLICATION_JSON, restResponse.getMediaType().toString());
}
@Test
public void testGetGroupCountWithoutSearchAndTopLevelFlagFalse() {
// Given
Long countResult = 5L;
JSONObject response = new JSONObject();
try {
response.put("count", countResult);
} catch (JSONException e) {
fail(e.getMessage());
}
// When
when(realmMock.getGroupsCount(false)).thenReturn(countResult);
//Then
Response restResponse = subject.getGroupCount(null, "false");
assertEquals(response.toString(), restResponse.getEntity());
assertEquals(MediaType.APPLICATION_JSON, restResponse.getMediaType().toString());
}
@Test
public void testGetGroupCountWithoutSearchAndTopLevelFlagNull() {
// Given
Long countResult = 5L;
JSONObject response = new JSONObject();
try {
response.put("count", countResult);
} catch (JSONException e) {
fail(e.getMessage());
}
// When
when(realmMock.getGroupsCount(false)).thenReturn(countResult);
//Then
Response restResponse = subject.getGroupCount(null, null);
assertEquals(response.toString(), restResponse.getEntity());
assertEquals(MediaType.APPLICATION_JSON, restResponse.getMediaType().toString());
}
}

66
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/group/GroupTest.java
View file

@ -92,7 +92,6 @@ public class GroupTest extends AbstractGroupTest {
user.setCredentials(credentials);
users.add(user);
List<ClientRepresentation> clients = testRealmRep.getClients();
ClientRepresentation client = new ClientRepresentation();
@ -155,16 +154,16 @@ public class GroupTest extends AbstractGroupTest {
@Test
public void doNotAllowSameGroupNameAtSameLevel() throws Exception {
RealmResource realm = adminClient.realms().realm("test");
GroupRepresentation topGroup = new GroupRepresentation();
topGroup.setName("top");
topGroup = createGroup(realm, topGroup);
GroupRepresentation anotherTopGroup = new GroupRepresentation();
anotherTopGroup.setName("top");
Response response = realm.groups().add(anotherTopGroup);
assertEquals(409, response.getStatus()); // conflict status 409 - same name not allowed
GroupRepresentation level2Group = new GroupRepresentation();
level2Group.setName("level2");
response = realm.groups().group(topGroup.getId()).subGroup(level2Group);
@ -177,7 +176,7 @@ public class GroupTest extends AbstractGroupTest {
response.close();
assertEquals(409, response.getStatus()); // conflict status 409 - same name not allowed
}
@Test
public void createAndTestGroups() throws Exception {
RealmResource realm = adminClient.realms().realm("test");
@ -206,7 +205,7 @@ public class GroupTest extends AbstractGroupTest {
GroupRepresentation topGroup = new GroupRepresentation();
topGroup.setName("top");
topGroup = createGroup(realm, topGroup);
List<RoleRepresentation> roles = new LinkedList<>();
roles.add(topRole);
realm.groups().group(topGroup.getId()).roles().realmLevel().add(roles);
@ -634,4 +633,59 @@ public class GroupTest extends AbstractGroupTest {
assertEquals(110, group.members(0, 1000).size());
assertEquals(110, group.members(-1, -2).size());
}
@Test
public void searchAndCountGroups() throws Exception {
String firstGroupId = "";
RealmResource realm = adminClient.realms().realm("test");
// Clean up all test groups
for (GroupRepresentation group : realm.groups().groups()) {
GroupResource resource = realm.groups().group(group.getId());
resource.remove();
assertAdminEvents.assertEvent("test", OperationType.DELETE, AdminEventPaths.groupPath(group.getId()), ResourceType.GROUP);
}
// Add 20 new groups with known names
for (int i=0;i<20;i++) {
GroupRepresentation group = new GroupRepresentation();
group.setName("group"+i);
group = createGroup(realm, group);
if(i== 0) {
firstGroupId = group.getId();
}
}
// Get groups by search and pagination
List<GroupRepresentation> allGroups = realm.groups().groups();
assertEquals(20, allGroups.size());
List<GroupRepresentation> slice = realm.groups().groups(5, 7);
assertEquals(7, slice.size());
List<GroupRepresentation> search = realm.groups().groups("group1",0,20);
assertEquals(11, search.size());
for(GroupRepresentation group : search) {
assertTrue(group.getName().contains("group1"));
}
List<GroupRepresentation> noResultSearch = realm.groups().groups("abcd",0,20);
assertEquals(0, noResultSearch.size());
// Count
assertEquals(new Long(allGroups.size()), realm.groups().count().get("count"));
assertEquals(new Long(search.size()), realm.groups().count("group1").get("count"));
assertEquals(new Long(noResultSearch.size()), realm.groups().count("abcd").get("count"));
// Add a subgroup for onlyTopLevel flag testing
GroupRepresentation level2Group = new GroupRepresentation();
level2Group.setName("group1111");
Response response = realm.groups().group(firstGroupId).subGroup(level2Group);
response.close();
assertAdminEvents.assertEvent("test", OperationType.CREATE, AdminEventPaths.groupSubgroupsPath(firstGroupId), level2Group, ResourceType.GROUP);
assertEquals(new Long(allGroups.size()), realm.groups().count(true).get("count"));
assertEquals(new Long(allGroups.size() + 1), realm.groups().count(false).get("count"));
}
}

6
themes/src/main/resources/theme/base/admin/resources/js/controllers/groups.js
View file

@ -36,7 +36,7 @@ module.controller('GroupListCtrl', function($scope, $route, $q, realm, groups, g
Groups.query(queryParams, function(entry) {
promiseGetGroups.resolve(entry);
}, function() {
promiseGetGroups.reject('Unable to fetch ' + i);
promiseGetGroups.reject('Unable to fetch ' + queryParams);
});
var promiseGetGroupsChain = promiseGetGroups.promise.then(function(entry) {
groups = entry;
@ -53,14 +53,12 @@ module.controller('GroupListCtrl', function($scope, $route, $q, realm, groups, g
GroupsCount.query(countParams, function(entry) {
promiseCount.resolve(entry);
}, function() {
promiseCount.reject('Unable to fetch ' + i);
promiseCount.reject('Unable to fetch ' + countParams);
});
var promiseCountChain = promiseCount.promise.then(function(entry) {
groupsCount = entry;
$scope.numberOfPages = Math.ceil(groupsCount.count/$scope.pageSize);
});
$q.all([promiseGetGroupsChain, promiseCountChain]);
};
$scope.$watch('currentPage', function(newValue, oldValue) {

4
themes/src/main/resources/theme/base/admin/resources/js/loaders.js
View file

@ -491,7 +491,7 @@ module.factory('GroupListLoader', function(Loader, Groups, $route, $q) {
return Loader.query(Groups, function() {
return {
realm : $route.current.params.realm,
first : 1,
first : 0,
max : 20
}
});
@ -501,7 +501,7 @@ module.factory('GroupCountLoader', function(Loader, GroupsCount, $route, $q) {
return Loader.query(GroupsCount, function() {
return {
realm : $route.current.params.realm,
top : 'true'
top : true
}
});
});