Skip to content

Commit 63523c5

Browse files
snicollsnicoll
committed
Merge pull request #47664 from eddumelendez
* pr/47664: Polish "Upgrade to Testcontainers 2.0.1" Upgrade to Testcontainers 2.0.1 Closes gh-47664
2 parents 8fc71a8 + adb6481 commit 63523c5

File tree

133 files changed

+306
-327
lines changed

Some content is hidden

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

133 files changed

+306
-327
lines changed

‎build-plugin/spring-boot-gradle-plugin/build.gradle‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ dependencies {
4141
dockerTestImplementation(gradleTestKit())
4242
dockerTestImplementation("org.assertj:assertj-core")
4343
dockerTestImplementation("org.junit.jupiter:junit-jupiter")
44-
dockerTestImplementation("org.testcontainers:junit-jupiter")
45-
dockerTestImplementation("org.testcontainers:testcontainers")
44+
dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
4645

4746
implementation(project(":buildpack:spring-boot-buildpack-platform"))
4847
implementation(project(":loader:spring-boot-loader-tools"))

‎build-plugin/spring-boot-maven-plugin/build.gradle‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ dependencies {
4343
}
4444
dockerTestImplementation("org.assertj:assertj-core")
4545
dockerTestImplementation("org.junit.jupiter:junit-jupiter")
46-
dockerTestImplementation("org.testcontainers:junit-jupiter")
47-
dockerTestImplementation("org.testcontainers:testcontainers")
46+
dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
4847

4948
implementation(project(":buildpack:spring-boot-buildpack-platform"))
5049
implementation(project(":loader:spring-boot-loader-tools"))

‎core/spring-boot-testcontainers/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ dependencies {
4141
dockerTestImplementation("org.mockito:mockito-core")
4242
dockerTestImplementation("org.springframework:spring-core-test")
4343
dockerTestImplementation("org.springframework:spring-jdbc")
44-
dockerTestImplementation("org.testcontainers:junit-jupiter")
45-
dockerTestImplementation("org.testcontainers:postgresql")
44+
dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
45+
dockerTestImplementation("org.testcontainers:testcontainers-postgresql")
4646

4747
dockerTestRuntimeOnly("com.zaxxer:HikariCP")
4848
dockerTestRuntimeOnly("com.h2database:h2")
@@ -54,8 +54,8 @@ dependencies {
5454

5555
testImplementation(project(":core:spring-boot-test"))
5656
testImplementation(project(":test-support:spring-boot-test-support"))
57-
testImplementation("org.testcontainers:junit-jupiter")
58-
testImplementation("org.testcontainers:postgresql")
57+
testImplementation("org.testcontainers:testcontainers-junit-jupiter")
58+
testImplementation("org.testcontainers:testcontainers-postgresql")
5959
}
6060

6161
dockerTest {

‎core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/ImportTestcontainersTests.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.junit.jupiter.api.AfterEach;
2424
import org.junit.jupiter.api.Test;
2525
import org.testcontainers.containers.Container;
26-
import org.testcontainers.containers.PostgreSQLContainer;
26+
import org.testcontainers.postgresql.PostgreSQLContainer;
2727

2828
import org.springframework.boot.testcontainers.beans.TestcontainerBeanDefinition;
2929
import org.springframework.boot.testcontainers.context.ImportTestcontainers;
@@ -127,7 +127,7 @@ void importWhenHasBadArgsDynamicPropertySourceMethod() {
127127
static class ImportWithoutValue {
128128

129129
@ContainerAnnotation
130-
static PostgreSQLContainer<?> container = TestImage.container(PostgreSQLContainer.class);
130+
static PostgreSQLContainer container = TestImage.container(PostgreSQLContainer.class);
131131

132132
}
133133

@@ -144,21 +144,21 @@ static class NoContainers {
144144
@ImportTestcontainers
145145
static class NullContainer {
146146

147-
static @Nullable PostgreSQLContainer<?> container = null;
147+
static @Nullable PostgreSQLContainer container = null;
148148

149149
}
150150

151151
@ImportTestcontainers
152152
static class NonStaticContainer {
153153

154-
PostgreSQLContainer<?> container = TestImage.container(PostgreSQLContainer.class);
154+
PostgreSQLContainer container = TestImage.container(PostgreSQLContainer.class);
155155

156156
}
157157

158158
interface ContainerDefinitions {
159159

160160
@ContainerAnnotation
161-
PostgreSQLContainer<?> container = TestImage.container(PostgreSQLContainer.class);
161+
PostgreSQLContainer container = TestImage.container(PostgreSQLContainer.class);
162162

163163
}
164164

@@ -170,7 +170,7 @@ interface ContainerDefinitions {
170170
@ImportTestcontainers
171171
static class ContainerDefinitionsWithDynamicPropertySource {
172172

173-
static PostgreSQLContainer<?> container = TestImage.container(PostgreSQLContainer.class);
173+
static PostgreSQLContainer container = TestImage.container(PostgreSQLContainer.class);
174174

175175
@DynamicPropertySource
176176
static void containerProperties(DynamicPropertyRegistry registry) {

‎core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/LoadTimeWeaverAwareConsumerContainers.java‎

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

1717
package org.springframework.boot.testcontainers;
1818

19-
import org.testcontainers.containers.PostgreSQLContainer;
2019
import org.testcontainers.junit.jupiter.Container;
20+
import org.testcontainers.postgresql.PostgreSQLContainer;
2121

2222
import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
2323

@@ -30,6 +30,6 @@ interface LoadTimeWeaverAwareConsumerContainers {
3030

3131
@Container
3232
@ServiceConnection
33-
PostgreSQLContainer<?> postgreSQLContainer = new PostgreSQLContainer<>("postgres:16.1");
33+
PostgreSQLContainer postgreSQLContainer = new PostgreSQLContainer("postgres:16.1");
3434

3535
}

‎core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersImportWithPropertiesInjectedIntoLoadTimeWeaverAwareBeanIntegrationTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import org.jspecify.annotations.Nullable;
2020
import org.junit.jupiter.api.Test;
2121
import org.junit.jupiter.api.extension.ExtendWith;
22-
import org.testcontainers.containers.PostgreSQLContainer;
2322
import org.testcontainers.junit.jupiter.Container;
23+
import org.testcontainers.postgresql.PostgreSQLContainer;
2424

2525
import org.springframework.boot.context.properties.ConfigurationProperties;
2626
import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -90,7 +90,7 @@ public void setUrl(@Nullable String url) {
9090
static class Containers {
9191

9292
@Container
93-
static PostgreSQLContainer<?> container = TestImage.container(PostgreSQLContainer.class);
93+
static PostgreSQLContainer container = TestImage.container(PostgreSQLContainer.class);
9494

9595
@DynamicPropertySource
9696
static void setConnectionProperties(DynamicPropertyRegistry registry) {

‎core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersParallelStartupIntegrationTests.java‎

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

1919
import org.junit.jupiter.api.Test;
2020
import org.junit.jupiter.api.extension.ExtendWith;
21-
import org.testcontainers.containers.PostgreSQLContainer;
21+
import org.testcontainers.postgresql.PostgreSQLContainer;
2222

2323
import org.springframework.boot.test.system.CapturedOutput;
2424
import org.springframework.boot.test.system.OutputCaptureExtension;
@@ -54,17 +54,17 @@ void startsInParallel(CapturedOutput out) {
5454
static class ContainerConfig {
5555

5656
@Bean
57-
static PostgreSQLContainer<?> container1() {
57+
static PostgreSQLContainer container1() {
5858
return TestImage.container(PostgreSQLContainer.class);
5959
}
6060

6161
@Bean
62-
static PostgreSQLContainer<?> container2() {
62+
static PostgreSQLContainer container2() {
6363
return TestImage.container(PostgreSQLContainer.class);
6464
}
6565

6666
@Bean
67-
static PostgreSQLContainer<?> container3() {
67+
static PostgreSQLContainer container3() {
6868
return TestImage.container(PostgreSQLContainer.class);
6969
}
7070

‎core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersParallelStartupWithImportTestcontainersIntegrationTests.java‎

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

1919
import org.junit.jupiter.api.Test;
2020
import org.junit.jupiter.api.extension.ExtendWith;
21-
import org.testcontainers.containers.PostgreSQLContainer;
2221
import org.testcontainers.junit.jupiter.Container;
22+
import org.testcontainers.postgresql.PostgreSQLContainer;
2323

2424
import org.springframework.boot.test.system.CapturedOutput;
2525
import org.springframework.boot.test.system.OutputCaptureExtension;
@@ -52,13 +52,13 @@ void startsInParallel(CapturedOutput out) {
5252
static class Containers {
5353

5454
@Container
55-
static PostgreSQLContainer<?> container1 = TestImage.container(PostgreSQLContainer.class);
55+
static PostgreSQLContainer container1 = TestImage.container(PostgreSQLContainer.class);
5656

5757
@Container
58-
static PostgreSQLContainer<?> container2 = TestImage.container(PostgreSQLContainer.class);
58+
static PostgreSQLContainer container2 = TestImage.container(PostgreSQLContainer.class);
5959

6060
@Container
61-
static PostgreSQLContainer<?> container3 = TestImage.container(PostgreSQLContainer.class);
61+
static PostgreSQLContainer container3 = TestImage.container(PostgreSQLContainer.class);
6262

6363
}
6464

‎core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
import org.junit.jupiter.api.Test;
2424
import org.mockito.Mockito;
25-
import org.testcontainers.containers.PostgreSQLContainer;
25+
import org.testcontainers.postgresql.PostgreSQLContainer;
2626

2727
import org.springframework.aot.test.generate.TestGenerationContext;
2828
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
@@ -142,7 +142,7 @@ static class ContainerConfiguration {
142142

143143
@Bean
144144
@ServiceConnection
145-
PostgreSQLContainer<?> postgresContainer() {
145+
PostgreSQLContainer postgresContainer() {
146146
return TestImage.container(PostgreSQLContainer.class);
147147
}
148148

@@ -176,7 +176,7 @@ public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, B
176176

177177
static class TestcontainersRootBeanDefinition extends RootBeanDefinition implements TestcontainerBeanDefinition {
178178

179-
private final PostgreSQLContainer<?> container = TestImage.container(PostgreSQLContainer.class);
179+
private final PostgreSQLContainer container = TestImage.container(PostgreSQLContainer.class);
180180

181181
TestcontainersRootBeanDefinition() {
182182
setBeanClass(PostgreSQLContainer.class);

‎core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionStartsConnectionOnceIntegrationTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
import javax.sql.DataSource;
2222

2323
import org.junit.jupiter.api.Test;
24-
import org.testcontainers.containers.PostgreSQLContainer;
2524
import org.testcontainers.junit.jupiter.Container;
2625
import org.testcontainers.junit.jupiter.Testcontainers;
26+
import org.testcontainers.postgresql.PostgreSQLContainer;
2727
import org.testcontainers.utility.DockerImageName;
2828

2929
import org.springframework.boot.testsupport.container.TestImage;
@@ -67,7 +67,7 @@ DataSource dataSource() {
6767

6868
}
6969

70-
static class StartCountingPostgreSQLContainer extends PostgreSQLContainer<StartCountingPostgreSQLContainer> {
70+
static class StartCountingPostgreSQLContainer extends PostgreSQLContainer {
7171

7272
final AtomicInteger startCount = new AtomicInteger();
7373

0 commit comments

Comments
 (0)