Skip to content

Commit f2c778a

Browse files
philwebbphilwebb
committed
Merge branch '3.2.x'
Closes gh-41168
2 parents 905d6b9 + 43cd241 commit f2c778a

File tree

44 files changed

+384
-540
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+384
-540
lines changed

‎spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/activemq/ActiveMQClassicDockerComposeConnectionDetailsFactoryIntegrationTests.java

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@
1616

1717
package org.springframework.boot.docker.compose.service.connection.activemq;
1818

19-
import org.junit.jupiter.api.Test;
20-
2119
import org.springframework.boot.autoconfigure.jms.activemq.ActiveMQConnectionDetails;
22-
import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIntegrationTests;
20+
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
2321
import org.springframework.boot.testsupport.container.TestImage;
2422

2523
import static org.assertj.core.api.Assertions.assertThat;
@@ -30,16 +28,10 @@
3028
* @author Stephane Nicoll
3129
* @author Eddú Meléndez
3230
*/
33-
class ActiveMQClassicDockerComposeConnectionDetailsFactoryIntegrationTests
34-
extends AbstractDockerComposeIntegrationTests {
35-
36-
ActiveMQClassicDockerComposeConnectionDetailsFactoryIntegrationTests() {
37-
super("activemq-classic-compose.yaml", TestImage.ACTIVE_MQ_CLASSIC);
38-
}
31+
class ActiveMQClassicDockerComposeConnectionDetailsFactoryIntegrationTests {
3932

40-
@Test
41-
void runCreatesConnectionDetails() {
42-
ActiveMQConnectionDetails connectionDetails = run(ActiveMQConnectionDetails.class);
33+
@DockerComposeTest(composeFile = "activemq-classic-compose.yaml", image = TestImage.ACTIVE_MQ_CLASSIC)
34+
void runCreatesConnectionDetails(ActiveMQConnectionDetails connectionDetails) {
4335
assertThat(connectionDetails.getBrokerUrl()).isNotNull().startsWith("tcp://");
4436
assertThat(connectionDetails.getUser()).isEqualTo("root");
4537
assertThat(connectionDetails.getPassword()).isEqualTo("secret");

‎spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/activemq/ActiveMQDockerComposeConnectionDetailsFactoryIntegrationTests.java

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@
1616

1717
package org.springframework.boot.docker.compose.service.connection.activemq;
1818

19-
import org.junit.jupiter.api.Test;
20-
2119
import org.springframework.boot.autoconfigure.jms.activemq.ActiveMQConnectionDetails;
22-
import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIntegrationTests;
20+
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
2321
import org.springframework.boot.testsupport.container.TestImage;
2422

2523
import static org.assertj.core.api.Assertions.assertThat;
@@ -29,15 +27,10 @@
2927
*
3028
* @author Stephane Nicoll
3129
*/
32-
class ActiveMQDockerComposeConnectionDetailsFactoryIntegrationTests extends AbstractDockerComposeIntegrationTests {
33-
34-
ActiveMQDockerComposeConnectionDetailsFactoryIntegrationTests() {
35-
super("activemq-compose.yaml", TestImage.ACTIVE_MQ);
36-
}
30+
class ActiveMQDockerComposeConnectionDetailsFactoryIntegrationTests {
3731

38-
@Test
39-
void runCreatesConnectionDetails() {
40-
ActiveMQConnectionDetails connectionDetails = run(ActiveMQConnectionDetails.class);
32+
@DockerComposeTest(composeFile = "activemq-compose.yaml", image = TestImage.ACTIVE_MQ)
33+
void runCreatesConnectionDetails(ActiveMQConnectionDetails connectionDetails) {
4134
assertThat(connectionDetails.getBrokerUrl()).isNotNull().startsWith("tcp://");
4235
assertThat(connectionDetails.getUser()).isEqualTo("root");
4336
assertThat(connectionDetails.getPassword()).isEqualTo("secret");

‎spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/activemq/ArtemisDockerComposeConnectionDetailsFactoryIntegrationTests.java

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@
1616

1717
package org.springframework.boot.docker.compose.service.connection.activemq;
1818

19-
import org.junit.jupiter.api.Test;
20-
2119
import org.springframework.boot.autoconfigure.jms.artemis.ArtemisConnectionDetails;
2220
import org.springframework.boot.autoconfigure.jms.artemis.ArtemisMode;
23-
import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIntegrationTests;
21+
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
2422
import org.springframework.boot.testsupport.container.TestImage;
2523

2624
import static org.assertj.core.api.Assertions.assertThat;
@@ -30,15 +28,10 @@
3028
*
3129
* @author Eddú Meléndez
3230
*/
33-
class ArtemisDockerComposeConnectionDetailsFactoryIntegrationTests extends AbstractDockerComposeIntegrationTests {
34-
35-
ArtemisDockerComposeConnectionDetailsFactoryIntegrationTests() {
36-
super("artemis-compose.yaml", TestImage.ARTEMIS);
37-
}
31+
class ArtemisDockerComposeConnectionDetailsFactoryIntegrationTests {
3832

39-
@Test
40-
void runCreatesConnectionDetails() {
41-
ArtemisConnectionDetails connectionDetails = run(ArtemisConnectionDetails.class);
33+
@DockerComposeTest(composeFile = "artemis-compose.yaml", image = TestImage.ARTEMIS)
34+
void runCreatesConnectionDetails(ArtemisConnectionDetails connectionDetails) {
4235
assertThat(connectionDetails.getMode()).isEqualTo(ArtemisMode.NATIVE);
4336
assertThat(connectionDetails.getBrokerUrl()).isNotNull().startsWith("tcp://");
4437
assertThat(connectionDetails.getUser()).isEqualTo("root");

‎spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/cassandra/CassandraBitnamiDockerComposeConnectionDetailsFactoryIntegrationTests.java

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@
1818

1919
import java.util.List;
2020

21-
import org.junit.jupiter.api.Test;
22-
2321
import org.springframework.boot.autoconfigure.cassandra.CassandraConnectionDetails;
2422
import org.springframework.boot.autoconfigure.cassandra.CassandraConnectionDetails.Node;
25-
import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIntegrationTests;
23+
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
2624
import org.springframework.boot.testsupport.container.TestImage;
2725

2826
import static org.assertj.core.api.Assertions.assertThat;
@@ -32,16 +30,10 @@
3230
*
3331
* @author Scott Frederick
3432
*/
35-
class CassandraBitnamiDockerComposeConnectionDetailsFactoryIntegrationTests
36-
extends AbstractDockerComposeIntegrationTests {
37-
38-
CassandraBitnamiDockerComposeConnectionDetailsFactoryIntegrationTests() {
39-
super("cassandra-bitnami-compose.yaml", TestImage.BITNAMI_CASSANDRA);
40-
}
33+
class CassandraBitnamiDockerComposeConnectionDetailsFactoryIntegrationTests {
4134

42-
@Test
43-
void runCreatesConnectionDetails() {
44-
CassandraConnectionDetails connectionDetails = run(CassandraConnectionDetails.class);
35+
@DockerComposeTest(composeFile = "cassandra-bitnami-compose.yaml", image = TestImage.BITNAMI_CASSANDRA)
36+
void runCreatesConnectionDetails(CassandraConnectionDetails connectionDetails) {
4537
List<Node> contactPoints = connectionDetails.getContactPoints();
4638
assertThat(contactPoints).hasSize(1);
4739
Node node = contactPoints.get(0);

‎spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/cassandra/CassandraDockerComposeConnectionDetailsFactoryIntegrationTests.java

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@
1818

1919
import java.util.List;
2020

21-
import org.junit.jupiter.api.Test;
22-
2321
import org.springframework.boot.autoconfigure.cassandra.CassandraConnectionDetails;
2422
import org.springframework.boot.autoconfigure.cassandra.CassandraConnectionDetails.Node;
25-
import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIntegrationTests;
23+
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
2624
import org.springframework.boot.testsupport.container.TestImage;
2725

2826
import static org.assertj.core.api.Assertions.assertThat;
@@ -32,15 +30,10 @@
3230
*
3331
* @author Scott Frederick
3432
*/
35-
class CassandraDockerComposeConnectionDetailsFactoryIntegrationTests extends AbstractDockerComposeIntegrationTests {
36-
37-
CassandraDockerComposeConnectionDetailsFactoryIntegrationTests() {
38-
super("cassandra-compose.yaml", TestImage.CASSANDRA);
39-
}
33+
class CassandraDockerComposeConnectionDetailsFactoryIntegrationTests {
4034

41-
@Test
42-
void runCreatesConnectionDetails() {
43-
CassandraConnectionDetails connectionDetails = run(CassandraConnectionDetails.class);
35+
@DockerComposeTest(composeFile = "cassandra-compose.yaml", image = TestImage.CASSANDRA)
36+
void runCreatesConnectionDetails(CassandraConnectionDetails connectionDetails) {
4437
List<Node> contactPoints = connectionDetails.getContactPoints();
4538
assertThat(contactPoints).hasSize(1);
4639
Node node = contactPoints.get(0);

‎spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/elasticsearch/ElasticsearchBitnamiDockerComposeConnectionDetailsFactoryIntegrationTests.java

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,10 @@
1616

1717
package org.springframework.boot.docker.compose.service.connection.elasticsearch;
1818

19-
import org.junit.jupiter.api.Test;
20-
2119
import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchConnectionDetails;
2220
import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchConnectionDetails.Node;
2321
import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchConnectionDetails.Node.Protocol;
24-
import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIntegrationTests;
22+
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
2523
import org.springframework.boot.testsupport.container.TestImage;
2624

2725
import static org.assertj.core.api.Assertions.assertThat;
@@ -31,16 +29,10 @@
3129
*
3230
* @author Scott Frederick
3331
*/
34-
class ElasticsearchBitnamiDockerComposeConnectionDetailsFactoryIntegrationTests
35-
extends AbstractDockerComposeIntegrationTests {
36-
37-
ElasticsearchBitnamiDockerComposeConnectionDetailsFactoryIntegrationTests() {
38-
super("elasticsearch-bitnami-compose.yaml", TestImage.BITNAMI_ELASTICSEARCH);
39-
}
32+
class ElasticsearchBitnamiDockerComposeConnectionDetailsFactoryIntegrationTests {
4033

41-
@Test
42-
void runCreatesConnectionDetails() {
43-
ElasticsearchConnectionDetails connectionDetails = run(ElasticsearchConnectionDetails.class);
34+
@DockerComposeTest(composeFile = "elasticsearch-bitnami-compose.yaml", image = TestImage.BITNAMI_ELASTICSEARCH)
35+
void runCreatesConnectionDetails(ElasticsearchConnectionDetails connectionDetails) {
4436
assertThat(connectionDetails.getUsername()).isEqualTo("elastic");
4537
assertThat(connectionDetails.getPassword()).isEqualTo("secret");
4638
assertThat(connectionDetails.getPathPrefix()).isNull();

‎spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/elasticsearch/ElasticsearchDockerComposeConnectionDetailsFactoryIntegrationTests.java

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,10 @@
1616

1717
package org.springframework.boot.docker.compose.service.connection.elasticsearch;
1818

19-
import org.junit.jupiter.api.Test;
20-
2119
import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchConnectionDetails;
2220
import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchConnectionDetails.Node;
2321
import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchConnectionDetails.Node.Protocol;
24-
import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIntegrationTests;
22+
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
2523
import org.springframework.boot.testsupport.container.TestImage;
2624

2725
import static org.assertj.core.api.Assertions.assertThat;
@@ -33,15 +31,10 @@
3331
* @author Andy Wilkinson
3432
* @author Phillip Webb
3533
*/
36-
class ElasticsearchDockerComposeConnectionDetailsFactoryIntegrationTests extends AbstractDockerComposeIntegrationTests {
37-
38-
ElasticsearchDockerComposeConnectionDetailsFactoryIntegrationTests() {
39-
super("elasticsearch-compose.yaml", TestImage.ELASTICSEARCH_8);
40-
}
34+
class ElasticsearchDockerComposeConnectionDetailsFactoryIntegrationTests {
4135

42-
@Test
43-
void runCreatesConnectionDetails() {
44-
ElasticsearchConnectionDetails connectionDetails = run(ElasticsearchConnectionDetails.class);
36+
@DockerComposeTest(composeFile = "elasticsearch-compose.yaml", image = TestImage.ELASTICSEARCH_8)
37+
void runCreatesConnectionDetails(ElasticsearchConnectionDetails connectionDetails) {
4538
assertThat(connectionDetails.getUsername()).isEqualTo("elastic");
4639
assertThat(connectionDetails.getPassword()).isEqualTo("secret");
4740
assertThat(connectionDetails.getPathPrefix()).isNull();

‎spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/flyway/JdbcAdaptingFlywayConnectionDetailsFactoryIntegrationTests.java

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@
1616

1717
package org.springframework.boot.docker.compose.service.connection.flyway;
1818

19-
import org.junit.jupiter.api.Test;
20-
2119
import org.springframework.boot.autoconfigure.flyway.FlywayConnectionDetails;
22-
import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIntegrationTests;
20+
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
2321
import org.springframework.boot.testsupport.container.TestImage;
2422

2523
import static org.assertj.core.api.Assertions.assertThat;
@@ -29,15 +27,10 @@
2927
*
3028
* @author Andy Wilkinson
3129
*/
32-
class JdbcAdaptingFlywayConnectionDetailsFactoryIntegrationTests extends AbstractDockerComposeIntegrationTests {
33-
34-
JdbcAdaptingFlywayConnectionDetailsFactoryIntegrationTests() {
35-
super("flyway-compose.yaml", TestImage.POSTGRESQL);
36-
}
30+
class JdbcAdaptingFlywayConnectionDetailsFactoryIntegrationTests {
3731

38-
@Test
39-
void runCreatesConnectionDetails() {
40-
FlywayConnectionDetails connectionDetails = run(FlywayConnectionDetails.class);
32+
@DockerComposeTest(composeFile = "flyway-compose.yaml", image = TestImage.POSTGRESQL)
33+
void runCreatesConnectionDetails(FlywayConnectionDetails connectionDetails) {
4134
assertThat(connectionDetails.getUsername()).isEqualTo("myuser");
4235
assertThat(connectionDetails.getPassword()).isEqualTo("secret");
4336
assertThat(connectionDetails.getJdbcUrl()).startsWith("jdbc:postgresql://").endsWith("/mydatabase");

‎spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/ldap/OpenLdapDockerComposeConnectionDetailsFactoryIntegrationTests.java

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@
1616

1717
package org.springframework.boot.docker.compose.service.connection.ldap;
1818

19-
import org.junit.jupiter.api.Test;
20-
2119
import org.springframework.boot.autoconfigure.ldap.LdapConnectionDetails;
22-
import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIntegrationTests;
20+
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
2321
import org.springframework.boot.testsupport.container.TestImage;
2422

2523
import static org.assertj.core.api.Assertions.assertThat;
@@ -29,15 +27,10 @@
2927
*
3028
* @author Philipp Kessler
3129
*/
32-
class OpenLdapDockerComposeConnectionDetailsFactoryIntegrationTests extends AbstractDockerComposeIntegrationTests {
33-
34-
OpenLdapDockerComposeConnectionDetailsFactoryIntegrationTests() {
35-
super("ldap-compose.yaml", TestImage.OPEN_LDAP);
36-
}
30+
class OpenLdapDockerComposeConnectionDetailsFactoryIntegrationTests {
3731

38-
@Test
39-
void runCreatesConnectionDetails() {
40-
LdapConnectionDetails connectionDetails = run(LdapConnectionDetails.class);
32+
@DockerComposeTest(composeFile = "ldap-compose.yaml", image = TestImage.OPEN_LDAP)
33+
void runCreatesConnectionDetails(LdapConnectionDetails connectionDetails) {
4134
assertThat(connectionDetails.getUsername()).isEqualTo("cn=admin,dc=ldap,dc=example,dc=org");
4235
assertThat(connectionDetails.getPassword()).isEqualTo("somepassword");
4336
assertThat(connectionDetails.getBase()).isEqualTo("dc=ldap,dc=example,dc=org");

‎spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/liquibase/JdbcAdaptingLiquibaseConnectionDetailsFactoryIntegrationTests.java

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@
1616

1717
package org.springframework.boot.docker.compose.service.connection.liquibase;
1818

19-
import org.junit.jupiter.api.Test;
20-
2119
import org.springframework.boot.autoconfigure.liquibase.LiquibaseConnectionDetails;
22-
import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIntegrationTests;
20+
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
2321
import org.springframework.boot.testsupport.container.TestImage;
2422

2523
import static org.assertj.core.api.Assertions.assertThat;
@@ -29,15 +27,10 @@
2927
*
3028
* @author Andy Wilkinson
3129
*/
32-
class JdbcAdaptingLiquibaseConnectionDetailsFactoryIntegrationTests extends AbstractDockerComposeIntegrationTests {
33-
34-
JdbcAdaptingLiquibaseConnectionDetailsFactoryIntegrationTests() {
35-
super("liquibase-compose.yaml", TestImage.POSTGRESQL);
36-
}
30+
class JdbcAdaptingLiquibaseConnectionDetailsFactoryIntegrationTests {
3731

38-
@Test
39-
void runCreatesConnectionDetails() {
40-
LiquibaseConnectionDetails connectionDetails = run(LiquibaseConnectionDetails.class);
32+
@DockerComposeTest(composeFile = "liquibase-compose.yaml", image = TestImage.POSTGRESQL)
33+
void runCreatesConnectionDetails(LiquibaseConnectionDetails connectionDetails) {
4134
assertThat(connectionDetails.getUsername()).isEqualTo("myuser");
4235
assertThat(connectionDetails.getPassword()).isEqualTo("secret");
4336
assertThat(connectionDetails.getJdbcUrl()).startsWith("jdbc:postgresql://").endsWith("/mydatabase");

‎spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/mariadb/MariaDbBitnamiJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@
1616

1717
package org.springframework.boot.docker.compose.service.connection.mariadb;
1818

19-
import org.junit.jupiter.api.Test;
20-
2119
import org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails;
22-
import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIntegrationTests;
20+
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
2321
import org.springframework.boot.testsupport.container.TestImage;
2422

2523
import static org.assertj.core.api.Assertions.assertThat;
@@ -29,16 +27,10 @@
2927
*
3028
* @author Scott Frederick
3129
*/
32-
class MariaDbBitnamiJdbcDockerComposeConnectionDetailsFactoryIntegrationTests
33-
extends AbstractDockerComposeIntegrationTests {
34-
35-
MariaDbBitnamiJdbcDockerComposeConnectionDetailsFactoryIntegrationTests() {
36-
super("mariadb-bitnami-compose.yaml", TestImage.BITNAMI_MARIADB);
37-
}
30+
class MariaDbBitnamiJdbcDockerComposeConnectionDetailsFactoryIntegrationTests {
3831

39-
@Test
40-
void runCreatesConnectionDetails() {
41-
JdbcConnectionDetails connectionDetails = run(JdbcConnectionDetails.class);
32+
@DockerComposeTest(composeFile = "mariadb-bitnami-compose.yaml", image = TestImage.BITNAMI_MARIADB)
33+
void runCreatesConnectionDetails(JdbcConnectionDetails connectionDetails) {
4234
assertThat(connectionDetails.getUsername()).isEqualTo("myuser");
4335
assertThat(connectionDetails.getPassword()).isEqualTo("secret");
4436
assertThat(connectionDetails.getJdbcUrl()).startsWith("jdbc:mariadb://").endsWith("/mydatabase");

‎spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/mariadb/MariaDbBitnamiR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@
1717
package org.springframework.boot.docker.compose.service.connection.mariadb;
1818

1919
import io.r2dbc.spi.ConnectionFactoryOptions;
20-
import org.junit.jupiter.api.Test;
2120

2221
import org.springframework.boot.autoconfigure.r2dbc.R2dbcConnectionDetails;
23-
import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIntegrationTests;
22+
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
2423
import org.springframework.boot.testsupport.container.TestImage;
2524

2625
import static org.assertj.core.api.Assertions.assertThat;
@@ -30,16 +29,10 @@
3029
*
3130
* @author Scott Frederick
3231
*/
33-
class MariaDbBitnamiR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests
34-
extends AbstractDockerComposeIntegrationTests {
32+
class MariaDbBitnamiR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests {
3533

36-
MariaDbBitnamiR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests() {
37-
super("mariadb-bitnami-compose.yaml", TestImage.BITNAMI_MARIADB);
38-
}
39-
40-
@Test
41-
void runCreatesConnectionDetails() {
42-
R2dbcConnectionDetails connectionDetails = run(R2dbcConnectionDetails.class);
34+
@DockerComposeTest(composeFile = "mariadb-bitnami-compose.yaml", image = TestImage.BITNAMI_MARIADB)
35+
void runCreatesConnectionDetails(R2dbcConnectionDetails connectionDetails) {
4336
ConnectionFactoryOptions connectionFactoryOptions = connectionDetails.getConnectionFactoryOptions();
4437
assertThat(connectionFactoryOptions.toString()).contains("database=mydatabase", "driver=mariadb",
4538
"password=REDACTED", "user=myuser");

0 commit comments

Comments
 (0)