tests seem to run fine after container update

Author: christophstrobl

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

@@ -16,7 +16,6 @@
 package org.springframework.data.mongodb.core.aggregation;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatRuntimeException;
 
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
@@ -54,7 +53,7 @@ public class VectorSearchTests {
 	static final String COLLECTION_NAME = "collection-1";
 	static MongoClient client;
 	static MongoTestTemplate template;
-	private static @Container AtlasContainer atlasLocal = new AtlasContainer();
+	private static @Container AtlasContainer atlasLocal = AtlasContainer.bestMatch();
 
 	@BeforeAll
 	static void beforeAll() throws InterruptedException {
@@ -94,19 +93,13 @@ void searchUsingBinaryVectorAddingScore(VectorSearchOperation searchOperation) {
 
 		VectorSearchOperation $search = searchOperation.withSearchScore(SCORE_FIELD);
 
-		assertThatRuntimeException().isThrownBy(
-				() -> template.aggregate(Aggregation.newAggregation($search), WithVectorFields.class, Document.class));
-
-		/* just in case the above starts working uncomment lines below:
-		 *
-		 * AggregationResults<Document> results = template.aggregate(Aggregation.newAggregation($search),
-		 * WithVectorFields.class, Document.class);
-		 *
-		 * assertThat(results).hasSize(10);
-		 * assertScoreIsDecreasing(results);
-		 * assertThat(results.iterator().next()).containsKey(SCORE_FIELD)
-		 * .extracting(it -> it.get(SCORE_FIELD), InstanceOfAssertFactories.DOUBLE).isEqualByComparingTo(1D);
-		 */
+		AggregationResults<Document> results = template.aggregate(Aggregation.newAggregation($search),
+				WithVectorFields.class, Document.class);
+
+		assertThat(results).hasSize(10);
+		assertScoreIsDecreasing(results);
+		assertThat(results.iterator().next()).containsKey(SCORE_FIELD)
+				.extracting(it -> it.get(SCORE_FIELD), InstanceOfAssertFactories.DOUBLE).isEqualByComparingTo(1D);
 	}
 
 	private static Stream<Arguments> binaryVectorAggregations() {

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

@@ -49,7 +49,7 @@
 @Testcontainers(disabledWithoutDocker = true)
 class VectorIndexIntegrationTests {
 
-	private static @Container AtlasContainer atlasLocal = new AtlasContainer();
+	private static @Container AtlasContainer atlasLocal = AtlasContainer.bestMatch();
 
 	MongoTestTemplate template = new MongoTestTemplate(cfg -> {
 		cfg.configureDatabaseFactory(ctx -> {

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/AtlasContainer.java

@@ -18,6 +18,7 @@
 import java.util.List;
 
 import org.bson.Document;
+import org.springframework.core.env.StandardEnvironment;
 import org.springframework.data.util.Lazy;
 import org.springframework.util.StringUtils;
 import org.testcontainers.containers.GenericContainer;
@@ -40,8 +41,20 @@ public class AtlasContainer extends GenericContainer<AtlasContainer> {
 	private static final String READY_DB = "__db_ready_check";
 	private final Lazy<MongoClient> client;
 
-	public AtlasContainer() {
-		this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
+	public static AtlasContainer bestMatch() {
+		return tagged(new StandardEnvironment().getProperty("mongodb.atlas.version", DEFAULT_TAG));
+	}
+
+	public static AtlasContainer latest() {
+		return tagged(DEFAULT_TAG);
+	}
+
+	public static AtlasContainer version8() {
+		return tagged("8.0.0");
+	}
+
+	public static AtlasContainer tagged(String tag) {
+		return new AtlasContainer(DEFAULT_IMAGE_NAME.withTag(tag));
 	}
 
 	public AtlasContainer(String dockerImageName) {
@@ -84,6 +97,7 @@ public boolean isHealthy() {
 			// ok so the search service is not ready yet - sigh
 		}
 		if (isReady) {
+			mongoClient.getDatabase(READY_DB).drop();
 			mongoClient.close();
 		}
 		return isReady;