Skip to content

Commit c6a55a5

Browse files
committed
Merge pull request #20936 from dreis2211
* pr/20936: Upgrade to Testcontainers 1.14.0 Closes gh-20936
2 parents 17e5b08 + 5b9d8bf commit c6a55a5

File tree

5 files changed

+6
-509
lines changed

5 files changed

+6
-509
lines changed

spring-boot-project/spring-boot-autoconfigure/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ dependencies {
180180
testImplementation("org.springframework.kafka:spring-kafka-test")
181181
testImplementation("org.springframework.security:spring-security-test")
182182
testImplementation("org.testcontainers:cassandra")
183+
testImplementation("org.testcontainers:couchbase")
183184
testImplementation("org.testcontainers:elasticsearch")
184185
testImplementation("org.testcontainers:junit-jupiter")
185186
testImplementation("org.testcontainers:testcontainers")

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@
2323
import com.couchbase.client.java.Bucket;
2424
import com.couchbase.client.java.Cluster;
2525
import com.couchbase.client.java.env.ClusterEnvironment;
26-
import com.couchbase.client.java.manager.bucket.BucketSettings;
2726
import org.junit.jupiter.api.Test;
27+
import org.testcontainers.couchbase.BucketDefinition;
28+
import org.testcontainers.couchbase.CouchbaseContainer;
2829
import org.testcontainers.junit.jupiter.Container;
2930
import org.testcontainers.junit.jupiter.Testcontainers;
3031

@@ -45,9 +46,9 @@ class CouchbaseAutoConfigurationIntegrationTests {
4546
private static final String BUCKET_NAME = "cbbucket";
4647

4748
@Container
48-
static final CouchbaseContainer couchbase = new CouchbaseContainer().withClusterAdmin("spring", "password")
49+
static final CouchbaseContainer couchbase = new CouchbaseContainer().withCredentials("spring", "password")
4950
.withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10))
50-
.withNewBucket(BucketSettings.create(BUCKET_NAME));
51+
.withBucket(new BucketDefinition(BUCKET_NAME));
5152

5253
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
5354
.withConfiguration(AutoConfigurations.of(CouchbaseAutoConfiguration.class))

0 commit comments

Comments
 (0)