From 15cc8418ed4d429a952b86f788717add8a93f76c Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Wed, 16 Jul 2014 12:01:15 +0200 Subject: [PATCH] DATAGRAPH-492 - Adapted to deprecation removals in Spring Data Commons. Related ticket: DATACMNS-469. --- .../data/neo4j/aspects/support/FinderTests.java | 4 ++-- .../aspects/support/GraphRepositoryTests.java | 6 +++--- .../neo4j/repository/GraphRepositoryTests.java | 14 +++++++------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/FinderTests.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/FinderTests.java index fd6ce131f..6bfb449e8 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/FinderTests.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/FinderTests.java @@ -212,8 +212,8 @@ public class FinderTests extends EntityTestBase { assertEquals("page size",2,page0.getSize()); assertEquals("total elements", totalElements,page0.getTotalElements()); assertEquals("page count",totalPages,page0.getTotalPages()); - assertEquals("next page",pageNumber < totalPages-1,page0.hasNextPage()); - assertEquals("previous page",pageNumber > 0,page0.hasPreviousPage()); + assertEquals("next page",pageNumber < totalPages-1,page0.hasNext()); + assertEquals("previous page",pageNumber > 0,page0.hasPrevious()); assertEquals("page content",asList(people),page0.getContent()); } } diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/GraphRepositoryTests.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/GraphRepositoryTests.java index ecd8f621e..153393b0c 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/GraphRepositoryTests.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/GraphRepositoryTests.java @@ -92,7 +92,7 @@ public class GraphRepositoryTests extends EntityTestBase { final PageRequest page = new PageRequest(0, 2, Sort.Direction.DESC, "member.name"); Page teamMemberPage1 = personRepository.findAllTeamMembersPaged(testTeam.sdg,page); assertEquals(asList(testTeam.michael, testTeam.emil), asCollection(teamMemberPage1)); - assertThat(teamMemberPage1.isFirstPage(), is(true)); + assertThat(teamMemberPage1.isFirst(), is(true)); } @SuppressWarnings("unchecked") @Test @@ -100,8 +100,8 @@ public class GraphRepositoryTests extends EntityTestBase { public void testFindPagedNull() { Page teamMemberPage1 = personRepository.findAllTeamMembersPaged(testTeam.sdg,null); assertEquals(new HashSet(asList(testTeam.david, testTeam.emil, testTeam.michael)), addToCollection(teamMemberPage1, new HashSet())); - assertThat(teamMemberPage1.isFirstPage(), is(true)); - assertThat(teamMemberPage1.isLastPage(), is(true)); + assertThat(teamMemberPage1.isFirst(), is(true)); + assertThat(teamMemberPage1.isLast(), is(true)); } @Test diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/GraphRepositoryTests.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/GraphRepositoryTests.java index ca22e89ce..a5e8bb949 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/GraphRepositoryTests.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/GraphRepositoryTests.java @@ -368,26 +368,26 @@ public class GraphRepositoryTests { final PageRequest page = new PageRequest(0, 2, Sort.Direction.DESC, "member.name"); Page teamMemberPage1 = personRepository.findAllTeamMembersPaged(testTeam.sdg, page); assertEquals(asList(testTeam.michael, testTeam.emil), asCollection(teamMemberPage1)); - assertThat(teamMemberPage1.isFirstPage(), is(true)); + assertThat(teamMemberPage1.isFirst(), is(true)); } @Test @Transactional public void testFindPagedNull() { Page teamMemberPage1 = personRepository.findAllTeamMembersPaged(testTeam.sdg, null); assertEquals(new HashSet(asList(testTeam.david, testTeam.emil, testTeam.michael)), addToCollection(teamMemberPage1, new HashSet())); - assertThat(teamMemberPage1.isFirstPage(), is(true)); - assertThat(teamMemberPage1.isLastPage(), is(true)); + assertThat(teamMemberPage1.isFirst(), is(true)); + assertThat(teamMemberPage1.isLast(), is(true)); } @Test @Transactional public void testFindPagedEmptyResult() { final Group group = neo4jTemplate.save(new Group()); Page result = personRepository.findAllTeamMembersPaged(group, new PageRequest(0,10)); - assertThat(result.isFirstPage(), is(true)); + assertThat(result.isFirst(), is(true)); assertThat(result.hasContent(), is(false)); - assertThat(result.hasNextPage(), is(false)); - assertThat(result.hasPreviousPage(), is(false)); - assertThat(result.isLastPage(), is(true)); + assertThat(result.hasNext(), is(false)); + assertThat(result.hasPrevious(), is(false)); + assertThat(result.isLast(), is(true)); assertEquals(true, result.getContent().isEmpty()); }