Test: add tests for window keyset position after first page

Signed-off-by: Artemiy Chereshnevvv <[email protected]>

Author: chrshnv

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryIntegrationTests.java

@@ -1465,8 +1465,8 @@ void queryByByteArray() {
 
 	@Test
 	void queryByWindowOffset() {
-		DummyEntity one = repository.save(createEntity("one"));
-		DummyEntity two = repository.save(createEntity("two"));
+		repository.save(createEntity("one"));
+		repository.save(createEntity("two"));
 		DummyEntity three = repository.save(createEntity("three"));
 
 		WindowIterator<DummyEntity> iter = WindowIterator.of(position -> repository.findFirst2ByOrderByIdPropAsc(position))
@@ -1481,8 +1481,8 @@ void queryByWindowOffset() {
 
 	@Test
 	void queryByWindowKeyset() {
-		DummyEntity one = repository.save(createEntity("one"));
-		DummyEntity two = repository.save(createEntity("two"));
+		repository.save(createEntity("one"));
+		repository.save(createEntity("two"));
 		DummyEntity three = repository.save(createEntity("three"));
 
 		WindowIterator<DummyEntity> iter = WindowIterator.of(position -> repository.findFirst2ByOrderByIdPropAsc(position))
@@ -1498,8 +1498,8 @@ void queryByWindowKeyset() {
 	@Test
 	void queryByWindowKeySetDesc() {
 		DummyEntity one = repository.save(createEntity("one"));
-		DummyEntity two = repository.save(createEntity("two"));
-		DummyEntity three = repository.save(createEntity("three"));
+		repository.save(createEntity("two"));
+		repository.save(createEntity("three"));
 
 		WindowIterator<DummyEntity> iter = WindowIterator.of(position -> repository.findFirst2ByOrderByIdPropDesc(position))
 				.startingAt(ScrollPosition.keyset());
@@ -1513,10 +1513,10 @@ void queryByWindowKeySetDesc() {
 
 	@Test
 	void queryByWindowKeySetDescBackward() {
-		DummyEntity one = repository.save(createEntity("one"));
-		DummyEntity two = repository.save(createEntity("two"));
-		DummyEntity three = repository.save(createEntity("three"));
-		DummyEntity four = repository.save(createEntity("four"));
+		repository.save(createEntity("one"));
+		repository.save(createEntity("two"));
+		repository.save(createEntity("three"));
+		repository.save(createEntity("four"));
 		DummyEntity five = repository.save(createEntity("five"));
 
 		WindowIterator<DummyEntity> iter = WindowIterator.of(position -> repository.findFirst2ByOrderByIdPropDesc(position))
@@ -1532,10 +1532,10 @@ void queryByWindowKeySetDescBackward() {
 	@Test
 	void queryByWindowKeySetAscBackward() {
 		DummyEntity one = repository.save(createEntity("one"));
-		DummyEntity two = repository.save(createEntity("two"));
-		DummyEntity three = repository.save(createEntity("three"));
-		DummyEntity four = repository.save(createEntity("four"));
-		DummyEntity five = repository.save(createEntity("five"));
+		repository.save(createEntity("two"));
+		repository.save(createEntity("three"));
+		repository.save(createEntity("four"));
+		repository.save(createEntity("five"));
 
 		WindowIterator<DummyEntity> iter = WindowIterator.of(position -> repository.findFirst2ByOrderByIdPropAsc(position))
 				.startingAt(ScrollPosition.backward(Map.of("idProp", 5)));
@@ -1561,10 +1561,10 @@ void queryByWindowKeySetEmptyDb() {
 
 	@Test
 	void queryByWindowKeySetTwoKeys() {
-		DummyEntity one = repository.save(createEntity("one", it -> it.setPointInTime(Instant.ofEpochSecond(1000))));
-		DummyEntity two = repository.save(createEntity("two", it -> it.setPointInTime(Instant.ofEpochSecond(2000))));
-		DummyEntity three = repository.save(createEntity("three", it -> it.setPointInTime(Instant.ofEpochSecond(3000))));
-		DummyEntity four = repository.save(createEntity("four", it -> it.setPointInTime(Instant.ofEpochSecond(4000))));
+		repository.save(createEntity("one", it -> it.setPointInTime(Instant.ofEpochSecond(1000))));
+		repository.save(createEntity("two", it -> it.setPointInTime(Instant.ofEpochSecond(2000))));
+		repository.save(createEntity("three", it -> it.setPointInTime(Instant.ofEpochSecond(3000))));
+		repository.save(createEntity("four", it -> it.setPointInTime(Instant.ofEpochSecond(4000))));
 		DummyEntity five = repository.save(createEntity("five", it -> it.setPointInTime(Instant.ofEpochSecond(5000))));
 
 		WindowIterator<DummyEntity> iter = WindowIterator.of(position -> repository.findFirst2ByOrderByIdPropAsc(position))
@@ -1579,9 +1579,9 @@ void queryByWindowKeySetTwoKeys() {
 
 	@Test
 	void queryByWindowOffsetPosition() {
-		DummyEntity one = repository.save(createEntity("one", it -> it.setPointInTime(Instant.ofEpochSecond(1000))));
-		DummyEntity two = repository.save(createEntity("two", it -> it.setPointInTime(Instant.ofEpochSecond(2000))));
-		DummyEntity three = repository.save(createEntity("three", it -> it.setPointInTime(Instant.ofEpochSecond(3000))));
+		repository.save(createEntity("one", it -> it.setPointInTime(Instant.ofEpochSecond(1000))));
+		repository.save(createEntity("two", it -> it.setPointInTime(Instant.ofEpochSecond(2000))));
+		repository.save(createEntity("three", it -> it.setPointInTime(Instant.ofEpochSecond(3000))));
 
 		Window<DummyEntity> result = repository.findFirst2ByOrderByIdPropAsc(ScrollPosition.offset());
 		assertSoftly(softAssertions -> {
@@ -1594,6 +1594,28 @@ void queryByWindowOffsetPosition() {
 		});
 	}
 
+	@Test
+	void queryByWindowKeysetPosition() {
+		repository.save(createEntity("one", it -> it.setPointInTime(Instant.ofEpochSecond(1000))));
+		repository.save(createEntity("two", it -> it.setPointInTime(Instant.ofEpochSecond(2000))));
+		repository.save(createEntity("three", it -> it.setPointInTime(Instant.ofEpochSecond(3000))));
+
+		Window<DummyEntity> result = repository.findFirst2ByOrderByIdPropAsc(ScrollPosition.keyset());
+		assertSoftly(softAssertions -> {
+			softAssertions.assertThat(result.hasNext()).isTrue();
+			softAssertions.assertThat(result.size()).isEqualTo(2);
+
+			ScrollPosition position = result.positionAt(0);
+			softAssertions.assertThat(position.isInitial()).isFalse();
+
+			Map<String, Object> keys = ((KeysetScrollPosition) position).getKeys();
+			softAssertions.assertThat(keys.containsKey("idProp")).isTrue();
+
+			Long idProp = (Long) keys.get("idProp");
+			softAssertions.assertThat(idProp).isEqualTo(2);
+		});
+	}
+
 	private Root createRoot(String namePrefix) {
 
 		return new Root(null, namePrefix,