Polishing.

Move Testcontainer creation into utility.

See #632
This commit is contained in:
Mark Paluch
2021-10-14 14:47:54 +02:00
committed by Greg L. Turnquist
parent e53d9b5643
commit a73d74a76d
53 changed files with 284 additions and 272 deletions

View File

@@ -18,6 +18,8 @@ package example.springdata.mongodb.aggregation;
import static org.assertj.core.api.Assertions.*;
import static org.assertj.core.data.Offset.offset;
import example.springdata.mongodb.util.MongoContainers;
import java.util.Date;
import org.junit.jupiter.api.BeforeEach;
@@ -28,10 +30,10 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.data.domain.Sort;
import org.springframework.test.context.DynamicPropertyRegistry;
import org.springframework.test.context.DynamicPropertySource;
import org.testcontainers.containers.MongoDBContainer;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
import org.testcontainers.utility.DockerImageName;
/**
* Integration tests for {@link OrderRepository}.
@@ -46,8 +48,7 @@ import org.testcontainers.utility.DockerImageName;
class OrderRepositoryIntegrationTests {
@Container //
private static MongoDBContainer mongoDBContainer = new MongoDBContainer(
DockerImageName.parse("mongo:5.0"));
private static MongoDBContainer mongoDBContainer = MongoContainers.getDefaultContainer();
@DynamicPropertySource
static void setProperties(DynamicPropertyRegistry registry) {

View File

@@ -18,6 +18,8 @@ package example.springdata.mongodb.aggregation;
import static org.assertj.core.api.Assertions.*;
import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
import example.springdata.mongodb.util.MongoContainers;
import java.nio.charset.StandardCharsets;
import java.util.List;
@@ -39,10 +41,10 @@ import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.test.context.DynamicPropertyRegistry;
import org.springframework.test.context.DynamicPropertySource;
import org.testcontainers.containers.MongoDBContainer;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
import org.testcontainers.utility.DockerImageName;
/**
* Examples for Spring Books using the MongoDB Aggregation Framework. Data originates from Google's Book search.
@@ -58,8 +60,7 @@ import org.testcontainers.utility.DockerImageName;
class SpringBooksIntegrationTests {
@Container //
private static MongoDBContainer mongoDBContainer = new MongoDBContainer(
DockerImageName.parse("mongo:5.0"));
private static MongoDBContainer mongoDBContainer = MongoContainers.getDefaultContainer();
@DynamicPropertySource
static void setProperties(DynamicPropertyRegistry registry) {