From ee8738e8380c8722a455e835de13c9e320478bcd Mon Sep 17 00:00:00 2001 From: Corneil du Plessis Date: Thu, 8 Jun 2023 23:10:59 +0200 Subject: [PATCH] Restore change for Mongo Tests. --- .../cloud/fn/common/mongo/MongoDbTestContainerSupport.java | 2 +- .../fn/consumer/mongo/MongoDbConsumerApplicationTests.java | 2 +- .../CustomPropsAndMongoMessageStoreAggregatorTests.java | 2 +- .../fn/supplier/mongo/MongodbSupplierApplicationTests.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/functions/common/mongodb-common/src/test/java/org/springframework/cloud/fn/common/mongo/MongoDbTestContainerSupport.java b/functions/common/mongodb-common/src/test/java/org/springframework/cloud/fn/common/mongo/MongoDbTestContainerSupport.java index 348fd361..8848a342 100644 --- a/functions/common/mongodb-common/src/test/java/org/springframework/cloud/fn/common/mongo/MongoDbTestContainerSupport.java +++ b/functions/common/mongodb-common/src/test/java/org/springframework/cloud/fn/common/mongo/MongoDbTestContainerSupport.java @@ -30,7 +30,7 @@ import org.testcontainers.junit.jupiter.Testcontainers; @Testcontainers(disabledWithoutDocker = true) public interface MongoDbTestContainerSupport { - MongoDBContainer MONGO_CONTAINER = new MongoDBContainer("mongo:5.0.9") + MongoDBContainer MONGO_CONTAINER = new MongoDBContainer("mongo:6.0.6") .withStartupTimeout(Duration.ofSeconds(120)) .withStartupAttempts(3); @BeforeAll diff --git a/functions/consumer/mongodb-consumer/src/test/java/org/springframework/cloud/fn/consumer/mongo/MongoDbConsumerApplicationTests.java b/functions/consumer/mongodb-consumer/src/test/java/org/springframework/cloud/fn/consumer/mongo/MongoDbConsumerApplicationTests.java index 60f8580c..b5f43bfc 100644 --- a/functions/consumer/mongodb-consumer/src/test/java/org/springframework/cloud/fn/consumer/mongo/MongoDbConsumerApplicationTests.java +++ b/functions/consumer/mongodb-consumer/src/test/java/org/springframework/cloud/fn/consumer/mongo/MongoDbConsumerApplicationTests.java @@ -51,7 +51,7 @@ class MongoDbConsumerApplicationTests implements MongoDbTestContainerSupport { @DynamicPropertySource static void mongoDbProperties(DynamicPropertyRegistry registry) { - registry.add("spring.data.mongodb.uri", MongoDbTestContainerSupport::mongoDbUri); + registry.add("spring.data.mongodb.port", MONGO_CONTAINER::getFirstMappedPort); registry.add("spring.data.mongodb.database", () -> "test"); } diff --git a/functions/function/aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/CustomPropsAndMongoMessageStoreAggregatorTests.java b/functions/function/aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/CustomPropsAndMongoMessageStoreAggregatorTests.java index d876303f..abbc4b66 100644 --- a/functions/function/aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/CustomPropsAndMongoMessageStoreAggregatorTests.java +++ b/functions/function/aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/CustomPropsAndMongoMessageStoreAggregatorTests.java @@ -51,7 +51,7 @@ public class CustomPropsAndMongoMessageStoreAggregatorTests extends AbstractAggr @DynamicPropertySource static void mongoDbProperties(DynamicPropertyRegistry registry) { - registry.add("spring.data.mongodb.uri", MongoDbTestContainerSupport::mongoDbUri); + registry.add("spring.data.mongodb.port", MONGO_CONTAINER::getFirstMappedPort); registry.add("spring.data.mongodb.database", () -> "test"); } diff --git a/functions/supplier/mongodb-supplier/src/test/java/org/springframework/cloud/fn/supplier/mongo/MongodbSupplierApplicationTests.java b/functions/supplier/mongodb-supplier/src/test/java/org/springframework/cloud/fn/supplier/mongo/MongodbSupplierApplicationTests.java index 9137cfbd..dd9189f8 100644 --- a/functions/supplier/mongodb-supplier/src/test/java/org/springframework/cloud/fn/supplier/mongo/MongodbSupplierApplicationTests.java +++ b/functions/supplier/mongodb-supplier/src/test/java/org/springframework/cloud/fn/supplier/mongo/MongodbSupplierApplicationTests.java @@ -50,7 +50,7 @@ class MongodbSupplierApplicationTests implements MongoDbTestContainerSupport { @DynamicPropertySource static void mongoDbProperties(DynamicPropertyRegistry registry) { - registry.add("spring.data.mongodb.uri", MongoDbTestContainerSupport::mongoDbUri); + registry.add("spring.data.mongodb.port", MONGO_CONTAINER::getFirstMappedPort); registry.add("spring.data.mongodb.database", () -> "test"); }