Skip to content

Commit 9e901b6

Browse files
snicollsnicoll
committed
Upgrade to Testcontainers 1.15.0
Closes gh-24103
1 parent 23ad2b4 commit 9e901b6

File tree

20 files changed

+38
-42
lines changed

20 files changed

+38
-42
lines changed

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationWithPasswordAuthenticationIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ static final class PasswordAuthenticatorCassandraContainer
8585
extends CassandraContainer<PasswordAuthenticatorCassandraContainer> {
8686

8787
PasswordAuthenticatorCassandraContainer() {
88-
super(DockerImageNames.cassandra().toString());
88+
super(DockerImageNames.cassandra());
8989
}
9090

9191
@Override

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class CouchbaseAutoConfigurationIntegrationTests {
4747
private static final String BUCKET_NAME = "cbbucket";
4848

4949
@Container
50-
static final CouchbaseContainer couchbase = new CouchbaseContainer(DockerImageNames.couchbase().toString())
50+
static final CouchbaseContainer couchbase = new CouchbaseContainer(DockerImageNames.couchbase())
5151
.withCredentials("spring", "password").withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10))
5252
.withBucket(new BucketDefinition(BUCKET_NAME).withPrimaryIndex(false));
5353

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
class CassandraDataAutoConfigurationIntegrationTests {
5050

5151
@Container
52-
static final CassandraContainer<?> cassandra = new CassandraContainer<>(DockerImageNames.cassandra().toString())
52+
static final CassandraContainer<?> cassandra = new CassandraContainer<>(DockerImageNames.cassandra())
5353
.withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10));
5454

5555
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfigurationTests.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,8 @@
4949
class ElasticsearchRepositoriesAutoConfigurationTests {
5050

5151
@Container
52-
static final ElasticsearchContainer elasticsearch = new ElasticsearchContainer(
53-
DockerImageNames.elasticsearch().toString()).withStartupAttempts(5)
54-
.withStartupTimeout(Duration.ofMinutes(10));
52+
static final ElasticsearchContainer elasticsearch = new ElasticsearchContainer(DockerImageNames.elasticsearch())
53+
.withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10));
5554

5655
private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
5756
.withConfiguration(AutoConfigurations.of(ElasticsearchRestClientAutoConfiguration.class,

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveElasticsearchRepositoriesAutoConfigurationTests.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,8 @@
4848
public class ReactiveElasticsearchRepositoriesAutoConfigurationTests {
4949

5050
@Container
51-
static ElasticsearchContainer elasticsearch = new ElasticsearchContainer(
52-
DockerImageNames.elasticsearch().toString()).withStartupAttempts(5)
53-
.withStartupTimeout(Duration.ofMinutes(10));
51+
static ElasticsearchContainer elasticsearch = new ElasticsearchContainer(DockerImageNames.elasticsearch())
52+
.withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10));
5453

5554
private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
5655
.withConfiguration(AutoConfigurations.of(ReactiveElasticsearchRestClientAutoConfiguration.class,

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveElasticsearchRestClientAutoConfigurationTests.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,8 @@
4848
public class ReactiveElasticsearchRestClientAutoConfigurationTests {
4949

5050
@Container
51-
static ElasticsearchContainer elasticsearch = new ElasticsearchContainer(
52-
DockerImageNames.elasticsearch().toString()).withStartupAttempts(5)
53-
.withStartupTimeout(Duration.ofMinutes(10));
51+
static ElasticsearchContainer elasticsearch = new ElasticsearchContainer(DockerImageNames.elasticsearch())
52+
.withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10));
5453

5554
private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
5655
.withConfiguration(AutoConfigurations.of(ReactiveElasticsearchRestClientAutoConfiguration.class));

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchRestClientAutoConfigurationTests.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,8 @@
6060
class ElasticsearchRestClientAutoConfigurationTests {
6161

6262
@Container
63-
static final ElasticsearchContainer elasticsearch = new ElasticsearchContainer(
64-
DockerImageNames.elasticsearch().toString()).withStartupAttempts(5)
65-
.withStartupTimeout(Duration.ofMinutes(10));
63+
static final ElasticsearchContainer elasticsearch = new ElasticsearchContainer(DockerImageNames.elasticsearch())
64+
.withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10));
6665

6766
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
6867
.withConfiguration(AutoConfigurations.of(ElasticsearchRestClientAutoConfiguration.class));

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationMongoTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
class SessionAutoConfigurationMongoTests extends AbstractSessionAutoConfigurationTests {
4848

4949
@Container
50-
static final MongoDBContainer mongoDB = new MongoDBContainer(DockerImageNames.mongo().toString())
51-
.withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(5));
50+
static final MongoDBContainer mongoDB = new MongoDBContainer(DockerImageNames.mongo()).withStartupAttempts(5)
51+
.withStartupTimeout(Duration.ofMinutes(5));
5252

5353
private final WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
5454
.withConfiguration(AutoConfigurations.of(MongoAutoConfiguration.class, MongoDataAutoConfiguration.class,

‎spring-boot-project/spring-boot-parent/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ bom {
161161
]
162162
}
163163
}
164-
library("Testcontainers", "1.14.3") {
164+
library("Testcontainers", "1.15.0") {
165165
group("org.testcontainers") {
166166
imports = [
167167
"testcontainers-bom"

‎spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
class DataMongoTestIntegrationTests {
4545

4646
@Container
47-
static final MongoDBContainer mongoDB = new MongoDBContainer(DockerImageNames.mongo().toString())
48-
.withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(5));
47+
static final MongoDBContainer mongoDB = new MongoDBContainer(DockerImageNames.mongo()).withStartupAttempts(5)
48+
.withStartupTimeout(Duration.ofMinutes(5));
4949

5050
@Autowired
5151
private MongoTemplate mongoTemplate;

‎spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestReactiveIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
class DataMongoTestReactiveIntegrationTests {
4242

4343
@Container
44-
static final MongoDBContainer mongoDB = new MongoDBContainer(DockerImageNames.mongo().toString())
45-
.withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(5));
44+
static final MongoDBContainer mongoDB = new MongoDBContainer(DockerImageNames.mongo()).withStartupAttempts(5)
45+
.withStartupTimeout(Duration.ofMinutes(5));
4646

4747
@Autowired
4848
private ReactiveMongoTemplate mongoTemplate;

‎spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestWithIncludeFilterIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
class DataMongoTestWithIncludeFilterIntegrationTests {
4343

4444
@Container
45-
static final MongoDBContainer mongoDB = new MongoDBContainer(DockerImageNames.mongo().toString())
46-
.withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(5));
45+
static final MongoDBContainer mongoDB = new MongoDBContainer(DockerImageNames.mongo()).withStartupAttempts(5)
46+
.withStartupTimeout(Duration.ofMinutes(5));
4747

4848
@Autowired
4949
private ExampleService service;

‎spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/TransactionalDataMongoTestIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
class TransactionalDataMongoTestIntegrationTests {
4949

5050
@Container
51-
static final MongoDBContainer mongoDB = new MongoDBContainer(DockerImageNames.mongo().toString())
52-
.withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(5));
51+
static final MongoDBContainer mongoDB = new MongoDBContainer(DockerImageNames.mongo()).withStartupAttempts(5)
52+
.withStartupTimeout(Duration.ofMinutes(5));
5353

5454
@Autowired
5555
private ExampleRepository exampleRepository;

‎spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
class DataNeo4jTestIntegrationTests {
4747

4848
@Container
49-
static final Neo4jContainer<?> neo4j = new Neo4jContainer<>(DockerImageNames.neo4j().toString())
50-
.withoutAuthentication().withStartupTimeout(Duration.ofMinutes(10));
49+
static final Neo4jContainer<?> neo4j = new Neo4jContainer<>(DockerImageNames.neo4j()).withoutAuthentication()
50+
.withStartupTimeout(Duration.ofMinutes(10));
5151

5252
@Autowired
5353
private Session session;

‎spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestPropertiesIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
class DataNeo4jTestPropertiesIntegrationTests {
4343

4444
@Container
45-
static final Neo4jContainer<?> neo4j = new Neo4jContainer<>(DockerImageNames.neo4j().toString())
46-
.withoutAuthentication().withStartupTimeout(Duration.ofMinutes(10));
45+
static final Neo4jContainer<?> neo4j = new Neo4jContainer<>(DockerImageNames.neo4j()).withoutAuthentication()
46+
.withStartupTimeout(Duration.ofMinutes(10));
4747

4848
@Autowired
4949
private Environment environment;

‎spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestWithIncludeFilterIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
class DataNeo4jTestWithIncludeFilterIntegrationTests {
4444

4545
@Container
46-
static final Neo4jContainer<?> neo4j = new Neo4jContainer<>(DockerImageNames.neo4j().toString())
47-
.withoutAuthentication().withStartupTimeout(Duration.ofMinutes(10));
46+
static final Neo4jContainer<?> neo4j = new Neo4jContainer<>(DockerImageNames.neo4j()).withoutAuthentication()
47+
.withStartupTimeout(Duration.ofMinutes(10));
4848

4949
@Autowired
5050
private ExampleService service;

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ private DockerImageNames() {
4646
* @return a docker image name for running cassandra
4747
*/
4848
public static DockerImageName cassandra() {
49-
return new DockerImageName("cassandra", CASSANDRA_VERSION);
49+
return DockerImageName.parse("cassandra").withTag(CASSANDRA_VERSION);
5050
}
5151

5252
/**
5353
* Return a {@link DockerImageName} suitable for running Cassandra.
5454
* @return a docker image name for running cassandra
5555
*/
5656
public static DockerImageName couchbase() {
57-
return new DockerImageName("couchbase/server", COUCHBASE_VERSION);
57+
return DockerImageName.parse("couchbase/server").withTag(COUCHBASE_VERSION);
5858
}
5959

6060
/**
@@ -64,39 +64,39 @@ public static DockerImageName couchbase() {
6464
*/
6565
public static DockerImageName elasticsearch() {
6666
String version = org.elasticsearch.Version.CURRENT.toString();
67-
return new DockerImageName("docker.elastic.co/elasticsearch/elasticsearch", version);
67+
return DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch").withTag(version);
6868
}
6969

7070
/**
7171
* Return a {@link DockerImageName} suitable for running Mongo.
7272
* @return a docker image name for running mongo
7373
*/
7474
public static DockerImageName mongo() {
75-
return new DockerImageName("mongo", MONGO_VERSION);
75+
return DockerImageName.parse("mongo").withTag(MONGO_VERSION);
7676
}
7777

7878
/**
7979
* Return a {@link DockerImageName} suitable for running Neo4j.
8080
* @return a docker image name for running neo4j
8181
*/
8282
public static DockerImageName neo4j() {
83-
return new DockerImageName("neo4j", NEO4J_VERSION);
83+
return DockerImageName.parse("neo4j").withTag(NEO4J_VERSION);
8484
}
8585

8686
/**
8787
* Return a {@link DockerImageName} suitable for running PostgreSQL.
8888
* @return a docker image name for running postgresql
8989
*/
9090
public static DockerImageName postgresql() {
91-
return new DockerImageName("postgres", POSTGRESQL_VERSION);
91+
return DockerImageName.parse("postgres").withTag(POSTGRESQL_VERSION);
9292
}
9393

9494
/**
9595
* Return a {@link DockerImageName} suitable for running Redis.
9696
* @return a docker image name for running redis
9797
*/
9898
public static DockerImageName redis() {
99-
return new DockerImageName("redis", REDIS_VERSION);
99+
return DockerImageName.parse("redis").withTag(REDIS_VERSION);
100100
}
101101

102102
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
public class RedisContainer extends GenericContainer<RedisContainer> {
2929

3030
public RedisContainer() {
31-
super(DockerImageNames.redis().toString());
31+
super(DockerImageNames.redis());
3232
addExposedPorts(6379);
3333
}
3434

‎spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-flyway/src/test/java/smoketest/data/r2dbc/CityRepositoryTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
class CityRepositoryTests {
3939

4040
@Container
41-
static PostgreSQLContainer<?> postgresql = new PostgreSQLContainer<>(DockerImageNames.postgresql().toString())
41+
static PostgreSQLContainer<?> postgresql = new PostgreSQLContainer<>(DockerImageNames.postgresql())
4242
.withDatabaseName("test_flyway");
4343

4444
@DynamicPropertySource

‎spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-liquibase/src/test/java/smoketest/data/r2dbc/CityRepositoryTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
class CityRepositoryTests {
3939

4040
@Container
41-
static PostgreSQLContainer<?> postgresql = new PostgreSQLContainer<>(DockerImageNames.postgresql().toString())
41+
static PostgreSQLContainer<?> postgresql = new PostgreSQLContainer<>(DockerImageNames.postgresql())
4242
.withDatabaseName("test_liquibase");
4343

4444
@DynamicPropertySource

0 commit comments

Comments
 (0)