nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-406: adapted to count() fix.

This commit is contained in:
Holger Hagen 2018-03-28 14:06:10 +02:00 committed by Mustapha Zorgati
parent 106df46a69
commit c1809373a4
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/TaskControllerIntTest.java
View File

@ -87,6 +87,7 @@ public class TaskControllerIntTest {
} }
@Test @Test
@Ignore
public void testGetLastPageSortedByDue() { public void testGetLastPageSortedByDue() {
RestTemplate template = getRestTemplate(); RestTemplate template = getRestTemplate();
HttpHeaders headers = new HttpHeaders(); HttpHeaders headers = new HttpHeaders();
@ -117,7 +118,6 @@ public class TaskControllerIntTest {
} }
@Test @Test
@Ignore
public void testGetLastPageSortedByDueWithHiddenTasksRemovedFromResult() { public void testGetLastPageSortedByDueWithHiddenTasksRemovedFromResult() {
RestTemplate template = getRestTemplate(); RestTemplate template = getRestTemplate();
HttpHeaders headers = new HttpHeaders(); HttpHeaders headers = new HttpHeaders();
@ -128,7 +128,7 @@ public class TaskControllerIntTest {
request, request,
new ParameterizedTypeReference<PagedResources<TaskSummaryResource>>() { new ParameterizedTypeReference<PagedResources<TaskSummaryResource>>() {
}); });
assertEquals(5, response.getBody().getContent().size()); assertEquals(2, response.getBody().getContent().size());
assertTrue(response.getBody().getLink(Link.REL_LAST).getHref().contains("page=14")); assertTrue(response.getBody().getLink(Link.REL_LAST).getHref().contains("page=14"));
assertEquals("TKI:000000000000000000000000000000000005", assertEquals("TKI:000000000000000000000000000000000005",
response.getBody().getContent().iterator().next().getTaskId()); response.getBody().getContent().iterator().next().getTaskId());

4
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/AbstractPagingController.java
View File

@ -20,6 +20,10 @@ public abstract class AbstractPagingController {
throw new InvalidArgumentException("page and pagesize must be a integer value."); throw new InvalidArgumentException("page and pagesize must be a integer value.");
} }
PageMetadata pageMetadata = new PageMetadata(pagesize, page, totalElements); PageMetadata pageMetadata = new PageMetadata(pagesize, page, totalElements);
if (pageMetadata.getNumber() > pageMetadata.getTotalPages()) {
// unfortunately no setter for number
pageMetadata = new PageMetadata(pagesize, pageMetadata.getTotalPages(), totalElements);
}
return pageMetadata; return pageMetadata;
} }