From 5e61e7979bd5bdcc2cbc6958f963bc170e6a3d06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Fri, 22 Jun 2018 14:47:53 +0200 Subject: [PATCH] Fix test for pagination --- .../UserCollectionToDtoMapperTest.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserCollectionToDtoMapperTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserCollectionToDtoMapperTest.java index 0f62f1023e..cd6a054c54 100644 --- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserCollectionToDtoMapperTest.java +++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserCollectionToDtoMapperTest.java @@ -63,14 +63,14 @@ public class UserCollectionToDtoMapperTest { @Test public void shouldSetPageNumber() { PageResult pageResult = mockPageResult("Hannes"); - UserCollectionDto userCollectionDto = mapper.map(1, 1, pageResult); - assertEquals(1, userCollectionDto.getPage()); + UserCollectionDto userCollectionDto = mapper.map(0, 1, pageResult); + assertEquals(0, userCollectionDto.getPage()); } @Test public void shouldHaveSelfLink() { PageResult pageResult = mockPageResult("Hannes"); - UserCollectionDto userCollectionDto = mapper.map(1, 1, pageResult); + UserCollectionDto userCollectionDto = mapper.map(0, 1, pageResult); assertTrue(userCollectionDto.getLinks().getLinkBy("self").get().getHref().startsWith(expectedBaseUri.toString())); } @@ -78,15 +78,15 @@ public class UserCollectionToDtoMapperTest { public void shouldCreateNextPageLink_whenHasMore() { PageResult pageResult = createPage(createUsers("Hannes", "Karl"), 0, 1); - UserCollectionDto userCollectionDto = mapper.map(1, 1, pageResult); - assertTrue(userCollectionDto.getLinks().getLinkBy("next").get().getHref().contains("page=2")); + UserCollectionDto userCollectionDto = mapper.map(0, 1, pageResult); + assertTrue(userCollectionDto.getLinks().getLinkBy("next").get().getHref().contains("page=1")); } @Test public void shouldNotCreateNextPageLink_whenNoMore() { - PageResult pageResult = mockPageResult("Hannes"); - UserCollectionDto userCollectionDto = mapper.map(1, 1, pageResult); - assertFalse(userCollectionDto.getLinks().stream().anyMatch(link -> link.getHref().contains("page=2"))); + PageResult pageResult = mockPageResult("Hannes", "Wurst", "X"); + UserCollectionDto userCollectionDto = mapper.map(0, 10, pageResult); + assertFalse(userCollectionDto.getLinks().getLinkBy("next").isPresent()); } @Test @@ -94,7 +94,7 @@ public class UserCollectionToDtoMapperTest { PageResult pageResult = mockPageResult("Hannes"); when(subject.isPermitted("user:create")).thenReturn(true); - UserCollectionDto userCollectionDto = mapper.map(1, 1, pageResult); + UserCollectionDto userCollectionDto = mapper.map(0, 1, pageResult); assertTrue(userCollectionDto.getLinks().getLinkBy("create").isPresent()); } @@ -104,7 +104,7 @@ public class UserCollectionToDtoMapperTest { PageResult pageResult = mockPageResult("Hannes"); when(subject.isPermitted("user:create")).thenReturn(false); - UserCollectionDto userCollectionDto = mapper.map(1, 1, pageResult); + UserCollectionDto userCollectionDto = mapper.map(0, 1, pageResult); assertFalse(userCollectionDto.getLinks().getLinkBy("create").isPresent()); } @@ -112,7 +112,7 @@ public class UserCollectionToDtoMapperTest { @Test public void shouldMapUsers() { PageResult pageResult = mockPageResult("Hannes", "Wurst"); - UserCollectionDto userCollectionDto = mapper.map(1, 2, pageResult); + UserCollectionDto userCollectionDto = mapper.map(0, 2, pageResult); List users = userCollectionDto.getEmbedded().getItemsBy("users"); assertEquals(2, users.size()); assertEquals("Hannes", ((UserDto) users.get(0)).getName());