Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-17 10:41:06 +01:00
Code Issues Packages Projects Releases Activity

Add overall count to collection results

Browse Source
This commit is contained in:
René Pfeuffer
2018-06-22 10:15:35 +02:00
parent 2daad8aab7
commit 9ec3833a97
8 changed files with 68 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupCollectionToDtoMapperTest.java
View File

@@ -54,35 +54,37 @@ public class GroupCollectionToDtoMapperTest {
@Test
public void shouldSetPageNumber() {
PageResult<Group> pageResult = mockPageResult(true, "nobodies");
PageResult<Group> pageResult = mockPageResult("nobodies");
GroupCollectionDto groupCollectionDto = mapper.map(1, 1, pageResult);
assertEquals(1, groupCollectionDto.getPage());
}
@Test
public void shouldHaveSelfLink() {
PageResult<Group> pageResult = mockPageResult(true, "nobodies");
PageResult<Group> pageResult = mockPageResult("nobodies");
GroupCollectionDto groupCollectionDto = mapper.map(1, 1, pageResult);
assertTrue(groupCollectionDto.getLinks().getLinkBy("self").get().getHref().startsWith(expectedBaseUri.toString()));
}
@Test
public void shouldCreateNextPageLink_whenHasMore() {
PageResult<Group> pageResult = mockPageResult(true, "nobodies");
PageResult<Group> intermediate = mockPageResult("nobodies");
PageResult<Group> pageResult = new PageResult<>(intermediate.getEntities(), 2);
GroupCollectionDto groupCollectionDto = mapper.map(1, 1, pageResult);
assertTrue(groupCollectionDto.getLinks().getLinkBy("next").get().getHref().contains("page=2"));
}
@Test
public void shouldNotCreateNextPageLink_whenNoMore() {
PageResult<Group> pageResult = mockPageResult(false, "nobodies");
PageResult<Group> pageResult = mockPageResult("nobodies");
GroupCollectionDto groupCollectionDto = mapper.map(1, 1, pageResult);
assertFalse(groupCollectionDto.getLinks().stream().anyMatch(link -> link.getHref().contains("page=2")));
}
@Test
public void shouldHaveCreateLink_whenHasPermission() {
PageResult<Group> pageResult = mockPageResult(false, "nobodies");
PageResult<Group> pageResult = mockPageResult("nobodies");
when(subject.isPermitted("group:create")).thenReturn(true);
GroupCollectionDto groupCollectionDto = mapper.map(1, 1, pageResult);
@@ -92,7 +94,7 @@ public class GroupCollectionToDtoMapperTest {
@Test
public void shouldNotHaveCreateLink_whenHasNoPermission() {
PageResult<Group> pageResult = mockPageResult(false, "nobodies");
PageResult<Group> pageResult = mockPageResult("nobodies");
when(subject.isPermitted("group:create")).thenReturn(false);
GroupCollectionDto groupCollectionDto = mapper.map(1, 1, pageResult);
@@ -102,7 +104,7 @@ public class GroupCollectionToDtoMapperTest {
@Test
public void shouldMapGroups() {
PageResult<Group> pageResult = mockPageResult(false, "nobodies", "bosses");
PageResult<Group> pageResult = mockPageResult("nobodies", "bosses");
GroupCollectionDto groupCollectionDto = mapper.map(1, 2, pageResult);
List<HalRepresentation> groups = groupCollectionDto.getEmbedded().getItemsBy("groups");
assertEquals(2, groups.size());
@@ -110,9 +112,9 @@ public class GroupCollectionToDtoMapperTest {
assertEquals("bosses", ((GroupDto) groups.get(1)).getName());
}
private PageResult<Group> mockPageResult(boolean hasMore, String... groupNames) {
private PageResult<Group> mockPageResult(String... groupNames) {
Collection<Group> groups = Arrays.stream(groupNames).map(this::mockGroupWithDto).collect(toList());
return new PageResult<>(groups, hasMore);
return new PageResult<>(groups, groups.size());
}
private Group mockGroupWithDto(String groupName) {

20
scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserCollectionToDtoMapperTest.java
View File

@@ -62,35 +62,37 @@ public class UserCollectionToDtoMapperTest {
@Test
public void shouldSetPageNumber() {
PageResult<User> pageResult = mockPageResult(true, "Hannes");
PageResult<User> pageResult = mockPageResult("Hannes");
UserCollectionDto userCollectionDto = mapper.map(1, 1, pageResult);
assertEquals(1, userCollectionDto.getPage());
}
@Test
public void shouldHaveSelfLink() {
PageResult<User> pageResult = mockPageResult(true, "Hannes");
PageResult<User> pageResult = mockPageResult("Hannes");
UserCollectionDto userCollectionDto = mapper.map(1, 1, pageResult);
assertTrue(userCollectionDto.getLinks().getLinkBy("self").get().getHref().startsWith(expectedBaseUri.toString()));
}
@Test
public void shouldCreateNextPageLink_whenHasMore() {
PageResult<User> pageResult = mockPageResult(true, "Hannes");
PageResult<User> intermediate = mockPageResult("Hannes");
PageResult<User> pageResult = new PageResult<>(intermediate.getEntities(), 2);
UserCollectionDto userCollectionDto = mapper.map(1, 1, pageResult);
assertTrue(userCollectionDto.getLinks().getLinkBy("next").get().getHref().contains("page=2"));
}
@Test
public void shouldNotCreateNextPageLink_whenNoMore() {
PageResult<User> pageResult = mockPageResult(false, "Hannes");
PageResult<User> pageResult = mockPageResult("Hannes");
UserCollectionDto userCollectionDto = mapper.map(1, 1, pageResult);
assertFalse(userCollectionDto.getLinks().stream().anyMatch(link -> link.getHref().contains("page=2")));
}
@Test
public void shouldHaveCreateLink_whenHasPermission() {
PageResult<User> pageResult = mockPageResult(false, "Hannes");
PageResult<User> pageResult = mockPageResult("Hannes");
when(subject.isPermitted("user:create")).thenReturn(true);
UserCollectionDto userCollectionDto = mapper.map(1, 1, pageResult);
@@ -100,7 +102,7 @@ public class UserCollectionToDtoMapperTest {
@Test
public void shouldNotHaveCreateLink_whenHasNoPermission() {
PageResult<User> pageResult = mockPageResult(false, "Hannes");
PageResult<User> pageResult = mockPageResult("Hannes");
when(subject.isPermitted("user:create")).thenReturn(false);
UserCollectionDto userCollectionDto = mapper.map(1, 1, pageResult);
@@ -110,7 +112,7 @@ public class UserCollectionToDtoMapperTest {
@Test
public void shouldMapUsers() {
PageResult<User> pageResult = mockPageResult(false, "Hannes", "Wurst");
PageResult<User> pageResult = mockPageResult("Hannes", "Wurst");
UserCollectionDto userCollectionDto = mapper.map(1, 2, pageResult);
List<HalRepresentation> users = userCollectionDto.getEmbedded().getItemsBy("users");
assertEquals(2, users.size());
@@ -118,9 +120,9 @@ public class UserCollectionToDtoMapperTest {
assertEquals("Wurst", ((UserDto) users.get(1)).getName());
}
private PageResult<User> mockPageResult(boolean hasMore, String... userNames) {
private PageResult<User> mockPageResult(String... userNames) {
Collection<User> users = Arrays.stream(userNames).map(this::mockUserWithDto).collect(toList());
return new PageResult<>(users, hasMore);
return new PageResult<>(users, users.size());
}
private User mockUserWithDto(String userName) {

4
scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserRootResourceTest.java
View File

@@ -26,8 +26,8 @@ import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.Collections;
import static java.util.Collections.singletonList;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -70,7 +70,7 @@ public class UserRootResourceTest {
public void prepareEnvironment() throws IOException, UserException {
initMocks(this);
User dummyUser = createDummyUser();
when(userManager.getPage(any(), eq(0), eq(10))).thenReturn(new PageResult<>(Collections.singletonList(dummyUser), true));
when(userManager.getPage(any(), eq(0), eq(10))).thenReturn(new PageResult<>(singletonList(dummyUser), 1));
when(userManager.get("Neo")).thenReturn(dummyUser);
doNothing().when(userManager).create(userCaptor.capture());