Skip to content

Commit 415ef6d

Browse files
committed
Fix flaky test for findByExample.
1 parent bb97a75 commit 415ef6d

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/test/java/org/springframework/data/neo4j/integration/imperative/QuerydslNeo4jPredicateExecutorIT.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ void scrollByExampleWithNoOffset(@Autowired QueryDSLPersonRepository repository)
137137
Predicate predicate = Expressions.predicate(Ops.EQ, firstNamePath, Expressions.asString("Helge"))
138138
.or(Expressions.predicate(Ops.EQ, lastNamePath, Expressions.asString("B.")));
139139

140-
Window<Person> peopleWindow = repository.findBy(predicate, q -> q.limit(1).scroll(ScrollPosition.offset(0)));
140+
Window<Person> peopleWindow = repository.findBy(predicate, q -> q.limit(1).sortBy(Sort.by("firstName").descending()).scroll(ScrollPosition.offset(0)));
141141

142142
assertThat(peopleWindow.getContent()).extracting(Person::getFirstName)
143143
.containsExactlyInAnyOrder("Helge");
@@ -154,7 +154,7 @@ void scrollByExampleWithOffset(@Autowired QueryDSLPersonRepository repository) {
154154
Predicate predicate = Expressions.predicate(Ops.EQ, firstNamePath, Expressions.asString("Helge"))
155155
.or(Expressions.predicate(Ops.EQ, lastNamePath, Expressions.asString("B.")));
156156

157-
Window<Person> peopleWindow = repository.findBy(predicate, q -> q.limit(1).scroll(ScrollPosition.offset(1)));
157+
Window<Person> peopleWindow = repository.findBy(predicate, q -> q.limit(1).sortBy(Sort.by("firstName").descending()).scroll(ScrollPosition.offset(1)));
158158

159159
assertThat(peopleWindow.getContent()).extracting(Person::getFirstName)
160160
.containsExactlyInAnyOrder("Bela");
@@ -170,7 +170,7 @@ void scrollByExampleWithContinuingOffset(@Autowired QueryDSLPersonRepository rep
170170
Predicate predicate = Expressions.predicate(Ops.EQ, firstNamePath, Expressions.asString("Helge"))
171171
.or(Expressions.predicate(Ops.EQ, lastNamePath, Expressions.asString("B.")));
172172

173-
Window<Person> peopleWindow = repository.findBy(predicate, q -> q.limit(1).scroll(ScrollPosition.offset(0)));
173+
Window<Person> peopleWindow = repository.findBy(predicate, q -> q.limit(1).sortBy(Sort.by("firstName").descending()).scroll(ScrollPosition.offset(0)));
174174
ScrollPosition currentPosition = peopleWindow.positionAt(peopleWindow.getContent().get(0));
175175
peopleWindow = repository.findBy(predicate, q -> q.limit(1).scroll(currentPosition));
176176

src/test/java/org/springframework/data/neo4j/integration/reactive/ReactiveQuerydslNeo4jPredicateExecutorIT.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ void scrollByExampleWithNoOffset(@Autowired QueryDSLPersonRepository repository)
196196
Predicate predicate = Expressions.predicate(Ops.EQ, firstNamePath, Expressions.asString("Helge"))
197197
.or(Expressions.predicate(Ops.EQ, lastNamePath, Expressions.asString("B.")));
198198

199-
repository.findBy(predicate, q -> q.limit(1).scroll(ScrollPosition.offset(0)))
199+
repository.findBy(predicate, q -> q.limit(1).sortBy(Sort.by("firstName").descending()).scroll(ScrollPosition.offset(0)))
200200
.as(StepVerifier::create)
201201
.expectNextMatches(peopleWindow -> {
202202

@@ -217,7 +217,7 @@ void scrollByExampleWithOffset(@Autowired QueryDSLPersonRepository repository) {
217217
Predicate predicate = Expressions.predicate(Ops.EQ, firstNamePath, Expressions.asString("Helge"))
218218
.or(Expressions.predicate(Ops.EQ, lastNamePath, Expressions.asString("B.")));
219219

220-
repository.findBy(predicate, q -> q.limit(1).scroll(ScrollPosition.offset(1)))
220+
repository.findBy(predicate, q -> q.limit(1).sortBy(Sort.by("firstName").descending()).scroll(ScrollPosition.offset(1)))
221221
.as(StepVerifier::create)
222222
.expectNextMatches(peopleWindow -> {
223223
assertThat(peopleWindow.getContent()).extracting(Person::getFirstName)
@@ -235,7 +235,7 @@ void scrollByExampleWithContinuingOffset(@Autowired QueryDSLPersonRepository rep
235235
Predicate predicate = Expressions.predicate(Ops.EQ, firstNamePath, Expressions.asString("Helge"))
236236
.or(Expressions.predicate(Ops.EQ, lastNamePath, Expressions.asString("B.")));
237237

238-
repository.findBy(predicate, q -> q.limit(1).scroll(ScrollPosition.offset(0)))
238+
repository.findBy(predicate, q -> q.limit(1).sortBy(Sort.by("firstName").descending()).scroll(ScrollPosition.offset(0)))
239239
.as(StepVerifier::create)
240240
.expectNextMatches(peopleWindow -> {
241241
ScrollPosition currentPosition = peopleWindow.positionAt(peopleWindow.getContent().get(0));

0 commit comments

Comments
 (0)