Skip to content

Commit a5a2ae7

Browse files
Add test for derived finder method using unpaged with sort.
1 parent 38a11d0 commit a5a2ae7

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java

+14-2
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import java.util.Arrays;
3737
import java.util.Collection;
3838
import java.util.Collections;
39+
import java.util.Comparator;
3940
import java.util.HashSet;
4041
import java.util.List;
4142
import java.util.Map;
@@ -2888,16 +2889,27 @@ void existsByExampleNegative() {
28882889
}
28892890

28902891
@Test // GH-3476
2891-
void unPagedSortedQuery() {
2892+
void findAllUsingUnpagePageableWithSort() {
28922893

28932894
flushTestUsers();
28942895

28952896
Sort sort = Sort.by(DESC, "firstname");
28962897
Page<User> firstPage = repository.findAll(PageRequest.of(0, 10, sort));
28972898
Page<User> secondPage = repository.findAll(Pageable.unpaged(sort));
2898-
assertThat(firstPage.getContent()).isEqualTo(secondPage.getContent());
2899+
assertThat(firstPage.getContent()).containsExactlyElementsOf(secondPage.getContent());
28992900
}
29002901

2902+
@Test // GH-3476
2903+
void derivedFinderUsingUnpagedPageableWithSort() {
2904+
2905+
flushTestUsers();
2906+
2907+
List<User> sortedUsers = new ArrayList<>(List.of(firstUser, secondUser, thirdUser, fourthUser));
2908+
sortedUsers.sort(Comparator.comparing(User::getEmailAddress));
2909+
2910+
assertThat(repository.findByEmailAddressLike("%@%", Pageable.unpaged(Sort.by(Direction.ASC, "lastname"))))
2911+
.containsExactlyElementsOf(sortedUsers);
2912+
}
29012913

29022914
@Test // DATAJPA-905
29032915
void executesPagedSpecificationSettingAnOrder() {

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/sample/UserRepository.java

+2
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,8 @@ Window<User> findTop3ByFirstnameStartingWithOrderByFirstnameAscEmailAddressAsc(S
189189

190190
List<User> findByEmailAddressLike(String email, Sort sort);
191191

192+
List<User> findByEmailAddressLike(String email, Pageable pageable);
193+
192194
List<SpecialUser> findSpecialUsersByLastname(String lastname);
193195

194196
List<User> findBySpringDataNamedQuery(String lastname);

0 commit comments

Comments
 (0)