Retry flakey vector search tests.

Upgrade junit-pioneer along the way

Author: christophstrobl

spring-data-mongodb/pom.xml

@@ -264,7 +264,7 @@
 		<dependency>
 			<groupId>org.junit-pioneer</groupId>
 			<artifactId>junit-pioneer</artifactId>
-			<version>0.5.3</version>
+			<version>2.3.0</version>
 			<scope>test</scope>
 		</dependency>
 

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateIndexTests.java

@@ -19,6 +19,8 @@
 import static org.assertj.core.data.Index.atIndex;
 import static org.springframework.data.mongodb.test.util.Assertions.*;
 
+import org.junit.jupiter.api.RepeatedTest;
+import org.junitpioneer.jupiter.RetryingTest;
 import reactor.core.publisher.Flux;
 import reactor.test.StepVerifier;
 
@@ -30,7 +32,6 @@
 import org.bson.Document;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.junitpioneer.jupiter.RepeatFailedTest;
 
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.data.annotation.Id;
@@ -80,7 +81,7 @@ void setUp() {
 	@AfterEach
 	void cleanUp() {}
 
-	@RepeatFailedTest(3) // DATAMONGO-1444
+	@RetryingTest(3) // DATAMONGO-1444
 	void testEnsureIndexShouldCreateIndex() {
 
 		Person p1 = new Person("Oliver");
@@ -116,7 +117,7 @@ void testEnsureIndexShouldCreateIndex() {
 				}).verifyComplete();
 	}
 
-	@RepeatFailedTest(3) // DATAMONGO-1444
+	@RetryingTest(3) // DATAMONGO-1444
 	void getIndexInfoShouldReturnCorrectIndex() {
 
 		Person p1 = new Person("Oliver");
@@ -146,7 +147,7 @@ void getIndexInfoShouldReturnCorrectIndex() {
 				}).verifyComplete();
 	}
 
-	@RepeatFailedTest(3) // DATAMONGO-1444, DATAMONGO-2264
+	@RetryingTest(3) // DATAMONGO-1444, DATAMONGO-2264
 	void testReadIndexInfoForIndicesCreatedViaMongoShellCommands() {
 
 		template.indexOps(Person.class).dropAllIndexes() //
@@ -196,7 +197,7 @@ void testReadIndexInfoForIndicesCreatedViaMongoShellCommands() {
 				}).verifyComplete();
 	}
 
-	@RepeatFailedTest(3) // DATAMONGO-1928
+	@RetryingTest(3) // DATAMONGO-1928
 	void shouldCreateIndexOnAccess() {
 
 		template.getCollection("indexedSample").flatMapMany(it -> it.listIndexes(Document.class)) //
@@ -216,7 +217,7 @@ void shouldCreateIndexOnAccess() {
 				.verifyComplete();
 	}
 
-	@RepeatFailedTest(3) // DATAMONGO-1928, DATAMONGO-2264
+	@RetryingTest(3) // DATAMONGO-1928, DATAMONGO-2264
 	void indexCreationShouldFail() throws InterruptedException {
 
 		factory.getMongoDatabase() //

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/ChangeStreamTests.java

@@ -38,8 +38,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.junitpioneer.jupiter.RepeatFailedTest;
 
+import org.junitpioneer.jupiter.RetryingTest;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.ChangeStreamOptions;
 import org.springframework.data.mongodb.core.CollectionOptions;
@@ -195,7 +195,7 @@ void useAggregationToFilterMessages() throws InterruptedException {
 		assertThat(messageBodies).hasSize(2).doesNotContain(sugarSplashy);
 	}
 
-	@RepeatFailedTest(3) // DATAMONGO-1803
+	@RetryingTest(3) // DATAMONGO-1803
 	void mapsTypedAggregationToFilterMessages() throws InterruptedException {
 
 		CollectingMessageListener<ChangeStreamDocument<Document>, User> messageListener = new CollectingMessageListener<>();

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/MongoRepositoryContributorTests.java

@@ -36,6 +36,7 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junitpioneer.jupiter.RetryingTest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -143,9 +144,10 @@ private static void initializeVectorIndex() {
 
 		// wait for search index to be queryable
 
-		Awaitility.await().atMost(Duration.ofSeconds(120)).pollInterval(Duration.ofMillis(200)).until(() -> {
-			return MongoTestUtils.isSearchIndexReady(indexName, client, DB_NAME, COLLECTION_NAME);
-		});
+		Awaitility.await().atLeast(Duration.ofMillis(50)).atMost(Duration.ofSeconds(120))
+				.pollInterval(Duration.ofMillis(250)).until(() -> {
+					return MongoTestUtils.isSearchIndexReady(indexName, client, DB_NAME, COLLECTION_NAME);
+				});
 
 		Document $vectorSearch = new Document("$vectorSearch",
 				new Document("index", indexName).append("limit", 1).append("numCandidates", 20).append("path", "embedding")
@@ -812,7 +814,7 @@ void testNearReturningGeoPage() {
 		assertThat(page2.hasNext()).isFalse();
 	}
 
-	@Test
+	@RetryingTest(3)
 	@EnableIfVectorSearchAvailable(database = DB_NAME, collection = User.class)
 	void vectorSearchFromAnnotation() {
 
@@ -824,7 +826,7 @@ void vectorSearchFromAnnotation() {
 		assertThat(results).hasSize(1);
 	}
 
-	@Test
+	@RetryingTest(3)
 	@EnableIfVectorSearchAvailable(database = DB_NAME, collection = User.class)
 	void vectorSearchWithDerivedQuery() {
 
@@ -837,7 +839,7 @@ void vectorSearchWithDerivedQuery() {
 		assertThat(results).hasSize(1);
 	}
 
-	@Test
+	@RetryingTest(3)
 	@EnableIfVectorSearchAvailable(database = DB_NAME, collection = User.class)
 	void vectorSearchReturningResultsAsList() {
 
@@ -849,7 +851,7 @@ void vectorSearchReturningResultsAsList() {
 		assertThat(results).hasSize(2);
 	}
 
-	@Test
+	@RetryingTest(3)
 	@EnableIfVectorSearchAvailable(database = DB_NAME, collection = User.class)
 	void vectorSearchWithLimitFromAnnotation() {
 
@@ -862,7 +864,7 @@ void vectorSearchWithLimitFromAnnotation() {
 		assertThat(results).hasSize(1);
 	}
 
-	@Test
+	@RetryingTest(3)
 	@EnableIfVectorSearchAvailable(database = DB_NAME, collection = User.class)
 	void vectorSearchWithSorting() {
 
@@ -875,7 +877,7 @@ void vectorSearchWithSorting() {
 		assertThat(results).hasSize(2);
 	}
 
-	@Test
+	@RetryingTest(3)
 	@EnableIfVectorSearchAvailable(database = DB_NAME, collection = User.class)
 	void vectorSearchWithLimitFromDerivedQuery() {