fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade to Testcontainers 1.15.0

Browse Source 
Closes gh-24103
This commit is contained in:
Stephane Nicoll 2020-11-10 16:24:16 +01:00
parent 23ad2b4156
commit 9e901b6e07
20 changed files with 38 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationWithPasswordAuthenticationIntegrationTests.java
View File

@ -85,7 +85,7 @@ class CassandraAutoConfigurationWithPasswordAuthenticationIntegrationTests {
extends CassandraContainer<PasswordAuthenticatorCassandraContainer> { extends CassandraContainer<PasswordAuthenticatorCassandraContainer> {
PasswordAuthenticatorCassandraContainer() { PasswordAuthenticatorCassandraContainer() {
super(DockerImageNames.cassandra().toString()); super(DockerImageNames.cassandra());
} }
@Override @Override

2
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationIntegrationTests.java
View File

@ -47,7 +47,7 @@ class CouchbaseAutoConfigurationIntegrationTests {
private static final String BUCKET_NAME = "cbbucket"; private static final String BUCKET_NAME = "cbbucket";
@Container @Container
static final CouchbaseContainer couchbase = new CouchbaseContainer(DockerImageNames.couchbase().toString()) static final CouchbaseContainer couchbase = new CouchbaseContainer(DockerImageNames.couchbase())
.withCredentials("spring", "password").withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10)) .withCredentials("spring", "password").withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10))
.withBucket(new BucketDefinition(BUCKET_NAME).withPrimaryIndex(false)); .withBucket(new BucketDefinition(BUCKET_NAME).withPrimaryIndex(false));

2
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java
View File

@ -49,7 +49,7 @@ import static org.assertj.core.api.Assertions.assertThat;
class CassandraDataAutoConfigurationIntegrationTests { class CassandraDataAutoConfigurationIntegrationTests {
@Container @Container
static final CassandraContainer<?> cassandra = new CassandraContainer<>(DockerImageNames.cassandra().toString()) static final CassandraContainer<?> cassandra = new CassandraContainer<>(DockerImageNames.cassandra())
.withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10)); .withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10));
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()

5
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfigurationTests.java
View File

@ -49,9 +49,8 @@ import static org.assertj.core.api.Assertions.assertThat;
class ElasticsearchRepositoriesAutoConfigurationTests { class ElasticsearchRepositoriesAutoConfigurationTests {
@Container @Container
static final ElasticsearchContainer elasticsearch = new ElasticsearchContainer( static final ElasticsearchContainer elasticsearch = new ElasticsearchContainer(DockerImageNames.elasticsearch())
DockerImageNames.elasticsearch().toString()).withStartupAttempts(5) .withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10));
.withStartupTimeout(Duration.ofMinutes(10));
private ApplicationContextRunner contextRunner = new ApplicationContextRunner() private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(ElasticsearchRestClientAutoConfiguration.class, .withConfiguration(AutoConfigurations.of(ElasticsearchRestClientAutoConfiguration.class,

5
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveElasticsearchRepositoriesAutoConfigurationTests.java
View File

@ -48,9 +48,8 @@ import static org.assertj.core.api.Assertions.assertThat;
public class ReactiveElasticsearchRepositoriesAutoConfigurationTests { public class ReactiveElasticsearchRepositoriesAutoConfigurationTests {
@Container @Container
static ElasticsearchContainer elasticsearch = new ElasticsearchContainer( static ElasticsearchContainer elasticsearch = new ElasticsearchContainer(DockerImageNames.elasticsearch())
DockerImageNames.elasticsearch().toString()).withStartupAttempts(5) .withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10));
.withStartupTimeout(Duration.ofMinutes(10));
private ApplicationContextRunner contextRunner = new ApplicationContextRunner() private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(ReactiveElasticsearchRestClientAutoConfiguration.class, .withConfiguration(AutoConfigurations.of(ReactiveElasticsearchRestClientAutoConfiguration.class,

5
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveElasticsearchRestClientAutoConfigurationTests.java
View File

@ -48,9 +48,8 @@ import static org.mockito.Mockito.mock;
public class ReactiveElasticsearchRestClientAutoConfigurationTests { public class ReactiveElasticsearchRestClientAutoConfigurationTests {
@Container @Container
static ElasticsearchContainer elasticsearch = new ElasticsearchContainer( static ElasticsearchContainer elasticsearch = new ElasticsearchContainer(DockerImageNames.elasticsearch())
DockerImageNames.elasticsearch().toString()).withStartupAttempts(5) .withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10));
.withStartupTimeout(Duration.ofMinutes(10));
private ApplicationContextRunner contextRunner = new ApplicationContextRunner() private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(ReactiveElasticsearchRestClientAutoConfiguration.class)); .withConfiguration(AutoConfigurations.of(ReactiveElasticsearchRestClientAutoConfiguration.class));

5
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchRestClientAutoConfigurationTests.java
View File

@ -60,9 +60,8 @@ import static org.mockito.Mockito.mock;
class ElasticsearchRestClientAutoConfigurationTests { class ElasticsearchRestClientAutoConfigurationTests {
@Container @Container
static final ElasticsearchContainer elasticsearch = new ElasticsearchContainer( static final ElasticsearchContainer elasticsearch = new ElasticsearchContainer(DockerImageNames.elasticsearch())
DockerImageNames.elasticsearch().toString()).withStartupAttempts(5) .withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10));
.withStartupTimeout(Duration.ofMinutes(10));
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(ElasticsearchRestClientAutoConfiguration.class)); .withConfiguration(AutoConfigurations.of(ElasticsearchRestClientAutoConfiguration.class));

4
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationMongoTests.java
View File

@ -47,8 +47,8 @@ import static org.assertj.core.api.Assertions.assertThat;
class SessionAutoConfigurationMongoTests extends AbstractSessionAutoConfigurationTests { class SessionAutoConfigurationMongoTests extends AbstractSessionAutoConfigurationTests {
@Container @Container
static final MongoDBContainer mongoDB = new MongoDBContainer(DockerImageNames.mongo().toString()) static final MongoDBContainer mongoDB = new MongoDBContainer(DockerImageNames.mongo()).withStartupAttempts(5)
.withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(5)); .withStartupTimeout(Duration.ofMinutes(5));
private final WebApplicationContextRunner contextRunner = new WebApplicationContextRunner() private final WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(MongoAutoConfiguration.class, MongoDataAutoConfiguration.class, .withConfiguration(AutoConfigurations.of(MongoAutoConfiguration.class, MongoDataAutoConfiguration.class,

2
spring-boot-project/spring-boot-parent/build.gradle
View File

@ -161,7 +161,7 @@ bom {
] ]
} }
} }
library("Testcontainers", "1.14.3") { library("Testcontainers", "1.15.0") {
group("org.testcontainers") { group("org.testcontainers") {
imports = [ imports = [
"testcontainers-bom" "testcontainers-bom"

4
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestIntegrationTests.java
View File

@ -44,8 +44,8 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
class DataMongoTestIntegrationTests { class DataMongoTestIntegrationTests {
@Container @Container
static final MongoDBContainer mongoDB = new MongoDBContainer(DockerImageNames.mongo().toString()) static final MongoDBContainer mongoDB = new MongoDBContainer(DockerImageNames.mongo()).withStartupAttempts(5)
.withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(5)); .withStartupTimeout(Duration.ofMinutes(5));
@Autowired @Autowired
private MongoTemplate mongoTemplate; private MongoTemplate mongoTemplate;

4
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestReactiveIntegrationTests.java
View File

@ -41,8 +41,8 @@ import static org.assertj.core.api.Assertions.assertThat;
class DataMongoTestReactiveIntegrationTests { class DataMongoTestReactiveIntegrationTests {
@Container @Container
static final MongoDBContainer mongoDB = new MongoDBContainer(DockerImageNames.mongo().toString()) static final MongoDBContainer mongoDB = new MongoDBContainer(DockerImageNames.mongo()).withStartupAttempts(5)
.withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(5)); .withStartupTimeout(Duration.ofMinutes(5));
@Autowired @Autowired
private ReactiveMongoTemplate mongoTemplate; private ReactiveMongoTemplate mongoTemplate;

4
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestWithIncludeFilterIntegrationTests.java
View File

@ -42,8 +42,8 @@ import static org.assertj.core.api.Assertions.assertThat;
class DataMongoTestWithIncludeFilterIntegrationTests { class DataMongoTestWithIncludeFilterIntegrationTests {
@Container @Container
static final MongoDBContainer mongoDB = new MongoDBContainer(DockerImageNames.mongo().toString()) static final MongoDBContainer mongoDB = new MongoDBContainer(DockerImageNames.mongo()).withStartupAttempts(5)
.withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(5)); .withStartupTimeout(Duration.ofMinutes(5));
@Autowired @Autowired
private ExampleService service; private ExampleService service;

4
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/TransactionalDataMongoTestIntegrationTests.java
View File

@ -48,8 +48,8 @@ import static org.assertj.core.api.Assertions.assertThat;
class TransactionalDataMongoTestIntegrationTests { class TransactionalDataMongoTestIntegrationTests {
@Container @Container
static final MongoDBContainer mongoDB = new MongoDBContainer(DockerImageNames.mongo().toString()) static final MongoDBContainer mongoDB = new MongoDBContainer(DockerImageNames.mongo()).withStartupAttempts(5)
.withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(5)); .withStartupTimeout(Duration.ofMinutes(5));
@Autowired @Autowired
private ExampleRepository exampleRepository; private ExampleRepository exampleRepository;

4
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestIntegrationTests.java
View File

@ -46,8 +46,8 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
class DataNeo4jTestIntegrationTests { class DataNeo4jTestIntegrationTests {
@Container @Container
static final Neo4jContainer<?> neo4j = new Neo4jContainer<>(DockerImageNames.neo4j().toString()) static final Neo4jContainer<?> neo4j = new Neo4jContainer<>(DockerImageNames.neo4j()).withoutAuthentication()
.withoutAuthentication().withStartupTimeout(Duration.ofMinutes(10)); .withStartupTimeout(Duration.ofMinutes(10));
@Autowired @Autowired
private Session session; private Session session;

4
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestPropertiesIntegrationTests.java
View File

@ -42,8 +42,8 @@ import static org.assertj.core.api.Assertions.assertThat;
class DataNeo4jTestPropertiesIntegrationTests { class DataNeo4jTestPropertiesIntegrationTests {
@Container @Container
static final Neo4jContainer<?> neo4j = new Neo4jContainer<>(DockerImageNames.neo4j().toString()) static final Neo4jContainer<?> neo4j = new Neo4jContainer<>(DockerImageNames.neo4j()).withoutAuthentication()
.withoutAuthentication().withStartupTimeout(Duration.ofMinutes(10)); .withStartupTimeout(Duration.ofMinutes(10));
@Autowired @Autowired
private Environment environment; private Environment environment;

4
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestWithIncludeFilterIntegrationTests.java
View File

@ -43,8 +43,8 @@ import static org.assertj.core.api.Assertions.assertThat;
class DataNeo4jTestWithIncludeFilterIntegrationTests { class DataNeo4jTestWithIncludeFilterIntegrationTests {
@Container @Container
static final Neo4jContainer<?> neo4j = new Neo4jContainer<>(DockerImageNames.neo4j().toString()) static final Neo4jContainer<?> neo4j = new Neo4jContainer<>(DockerImageNames.neo4j()).withoutAuthentication()
.withoutAuthentication().withStartupTimeout(Duration.ofMinutes(10)); .withStartupTimeout(Duration.ofMinutes(10));
@Autowired @Autowired
private ExampleService service; private ExampleService service;

14
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/DockerImageNames.java
View File

@ -46,7 +46,7 @@ public final class DockerImageNames {
* @return a docker image name for running cassandra * @return a docker image name for running cassandra
*/ */
public static DockerImageName cassandra() { public static DockerImageName cassandra() {
return new DockerImageName("cassandra", CASSANDRA_VERSION); return DockerImageName.parse("cassandra").withTag(CASSANDRA_VERSION);
} }
/** /**
@ -54,7 +54,7 @@ public final class DockerImageNames {
* @return a docker image name for running cassandra * @return a docker image name for running cassandra
*/ */
public static DockerImageName couchbase() { public static DockerImageName couchbase() {
return new DockerImageName("couchbase/server", COUCHBASE_VERSION); return DockerImageName.parse("couchbase/server").withTag(COUCHBASE_VERSION);
} }
/** /**
@ -64,7 +64,7 @@ public final class DockerImageNames {
*/ */
public static DockerImageName elasticsearch() { public static DockerImageName elasticsearch() {
String version = org.elasticsearch.Version.CURRENT.toString(); String version = org.elasticsearch.Version.CURRENT.toString();
return new DockerImageName("docker.elastic.co/elasticsearch/elasticsearch", version); return DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch").withTag(version);
} }
/** /**
@ -72,7 +72,7 @@ public final class DockerImageNames {
* @return a docker image name for running mongo * @return a docker image name for running mongo
*/ */
public static DockerImageName mongo() { public static DockerImageName mongo() {
return new DockerImageName("mongo", MONGO_VERSION); return DockerImageName.parse("mongo").withTag(MONGO_VERSION);
} }
/** /**
@ -80,7 +80,7 @@ public final class DockerImageNames {
* @return a docker image name for running neo4j * @return a docker image name for running neo4j
*/ */
public static DockerImageName neo4j() { public static DockerImageName neo4j() {
return new DockerImageName("neo4j", NEO4J_VERSION); return DockerImageName.parse("neo4j").withTag(NEO4J_VERSION);
} }
/** /**
@ -88,7 +88,7 @@ public final class DockerImageNames {
* @return a docker image name for running postgresql * @return a docker image name for running postgresql
*/ */
public static DockerImageName postgresql() { public static DockerImageName postgresql() {
return new DockerImageName("postgres", POSTGRESQL_VERSION); return DockerImageName.parse("postgres").withTag(POSTGRESQL_VERSION);
} }
/** /**
@ -96,7 +96,7 @@ public final class DockerImageNames {
* @return a docker image name for running redis * @return a docker image name for running redis
*/ */
public static DockerImageName redis() { public static DockerImageName redis() {
return new DockerImageName("redis", REDIS_VERSION); return DockerImageName.parse("redis").withTag(REDIS_VERSION);
} }
} }

2
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/RedisContainer.java
View File

@ -28,7 +28,7 @@ import org.testcontainers.containers.GenericContainer;
public class RedisContainer extends GenericContainer<RedisContainer> { public class RedisContainer extends GenericContainer<RedisContainer> {
public RedisContainer() { public RedisContainer() {
super(DockerImageNames.redis().toString()); super(DockerImageNames.redis());
addExposedPorts(6379); addExposedPorts(6379);
} }

2
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-flyway/src/test/java/smoketest/data/r2dbc/CityRepositoryTests.java
View File

@ -38,7 +38,7 @@ import static org.assertj.core.api.Assertions.assertThat;
class CityRepositoryTests { class CityRepositoryTests {
@Container @Container
static PostgreSQLContainer<?> postgresql = new PostgreSQLContainer<>(DockerImageNames.postgresql().toString()) static PostgreSQLContainer<?> postgresql = new PostgreSQLContainer<>(DockerImageNames.postgresql())
.withDatabaseName("test_flyway"); .withDatabaseName("test_flyway");
@DynamicPropertySource @DynamicPropertySource

2
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-liquibase/src/test/java/smoketest/data/r2dbc/CityRepositoryTests.java
View File

@ -38,7 +38,7 @@ import static org.assertj.core.api.Assertions.assertThat;
class CityRepositoryTests { class CityRepositoryTests {
@Container @Container
static PostgreSQLContainer<?> postgresql = new PostgreSQLContainer<>(DockerImageNames.postgresql().toString()) static PostgreSQLContainer<?> postgresql = new PostgreSQLContainer<>(DockerImageNames.postgresql())
.withDatabaseName("test_liquibase"); .withDatabaseName("test_liquibase");
@DynamicPropertySource @DynamicPropertySource