Spring/spring-data-neo4j
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAGRAPH-492 - Adapted to deprecation removals in Spring Data Commons.

Browse Source 
Related ticket: DATACMNS-469.
This commit is contained in:
Oliver Gierke
2014-07-16 12:01:15 +02:00
parent f6c6daac2d
commit 15cc8418ed
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/FinderTests.java
View File

@@ -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());
}
}

6
spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/GraphRepositoryTests.java
View File

@@ -92,7 +92,7 @@ public class GraphRepositoryTests extends EntityTestBase {
final PageRequest page = new PageRequest(0, 2, Sort.Direction.DESC, "member.name");
Page<Person> 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<Person> 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

14
spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/GraphRepositoryTests.java
View File

@@ -368,26 +368,26 @@ public class GraphRepositoryTests {
final PageRequest page = new PageRequest(0, 2, Sort.Direction.DESC, "member.name");
Page<Person> 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<Person> 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<Person> 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());
}