Slightly improve the test

micronaut-projects · Apr 18, 2024 · 6d261ea · 6d261ea
1 parent db7cc08
commit 6d261ea
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/data-model/src/main/java/io/micronaut/data/model/DefaultCursoredPage.java b/data-model/src/main/java/io/micronaut/data/model/DefaultCursoredPage.java
@@ -78,7 +78,7 @@ public boolean equals(Object o) {
 
     @Override
     public Optional<Cursor> getCursor(int i) {
-        return Optional.of(cursors.get(i));
+        return i >= cursors.size() ? Optional.empty() : Optional.of(cursors.get(i));
     }
 
     @Override

diff --git a/data-tck/src/main/groovy/io/micronaut/data/tck/tests/AbstractCursoredPageSpec.groovy b/data-tck/src/main/groovy/io/micronaut/data/tck/tests/AbstractCursoredPageSpec.groovy
@@ -75,6 +75,8 @@ abstract class AbstractCursoredPageSpec extends Specification {
         page.content[1].name == name2
         page.totalSize == 780
         page.totalPages == 78
+        page.getCursor(0).isPresent()
+        page.getCursor(9).isPresent()
         page.hasNext()
 
         when: "The next page is selected"
@@ -145,6 +147,8 @@ abstract class AbstractCursoredPageSpec extends Specification {
         page.pageNumber == 0
         page.content[0].name == elem1
         page.content.size() == 8
+        page.getCursor(7).isPresent()
+        page.getCursor(8).isEmpty()
         !page.hasPrevious()
         page.hasNext()
 
@@ -202,6 +206,8 @@ abstract class AbstractCursoredPageSpec extends Specification {
         page.pageNumber == 0
         page.content[0].name == elem1
         page.content[1].name == elem2
+        page.getCursor(1).isPresent()
+        page.getCursor(2).isEmpty()
         page.content.size() == 2
         !page.hasPrevious()