root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Upgrade to Testcontainers 1.14.3 

Closes gh-23122
This commit is contained in:
Andy Wilkinson 2020-08-28 11:57:32 +01:00
parent 0032ab6afe
commit 84a12c8436
2 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,23 +17,16 @@
package org.springframework.boot.autoconfigure.couchbase;
import java.time.Duration;
import java.util.Collections;
import java.util.List;
import com.couchbase.client.java.Bucket;
import com.couchbase.client.java.Cluster;
import com.couchbase.client.java.CouchbaseBucket;
import com.couchbase.client.java.bucket.BucketType;
import com.couchbase.client.java.cluster.BucketSettings;
import com.couchbase.client.java.cluster.ClusterInfo;
import com.couchbase.client.java.cluster.DefaultBucketSettings;
import com.couchbase.client.java.cluster.UserRole;
import com.couchbase.client.java.cluster.UserSettings;
import com.couchbase.client.java.env.CouchbaseEnvironment;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.testcontainers.couchbase.BucketDefinition;
import org.testcontainers.couchbase.CouchbaseContainer;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
@ -55,21 +48,15 @@ import static org.mockito.Mockito.mock;
@Testcontainers(disabledWithoutDocker = true)
class CouchbaseAutoConfigurationIntegrationTests {
private static final String BUCKET_NAME = "cbbucket";
@Container
static final CouchbaseContainer couchbase = new CouchbaseContainer().withClusterAdmin("spring", "password")
.withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10));
static final CouchbaseContainer couchbase = new CouchbaseContainer().withCredentials("spring", "password")
.withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10))
.withBucket(new BucketDefinition(BUCKET_NAME).withPrimaryIndex(false));
private AnnotationConfigApplicationContext context;
@BeforeAll
static void createBucket() {
BucketSettings bucketSettings = DefaultBucketSettings.builder().enableFlush(true).name("default")
.password("password").quota(100).replicas(0).type(BucketType.COUCHBASE).build();
List<UserRole> userSettings = Collections.singletonList(new UserRole("admin"));
couchbase.createBucket(bucketSettings,
UserSettings.build().password(bucketSettings.password()).roles(userSettings), true);
}
@BeforeEach
void setUp() {
this.context = new AnnotationConfigApplicationContext();
@ -77,7 +64,7 @@ class CouchbaseAutoConfigurationIntegrationTests {
TestPropertyValues.of("spring.couchbase.bootstrap-hosts=" + couchbase.getContainerIpAddress(),
"spring.couchbase.env.bootstrap.http-direct-port:" + couchbase.getMappedPort(8091),
"spring.couchbase.username:spring", "spring.couchbase.password:password",
"spring.couchbase.bucket.name:default").applyTo(this.context.getEnvironment());
"spring.couchbase.bucket.name:" + BUCKET_NAME).applyTo(this.context.getEnvironment());
}
@AfterEach

2
spring-boot-project/spring-boot-parent/pom.xml
View File

@ -32,7 +32,7 @@
<spring-asciidoctor-extensions.version>0.4.0.RELEASE</spring-asciidoctor-extensions.version>
<spring-doc-resources.version>0.1.3.RELEASE</spring-doc-resources.version>
<spring-doc-resources.url>https://repo.spring.io/release/io/spring/docresources/spring-doc-resources/${spring-doc-resources.version}/spring-doc-resources-${spring-doc-resources.version}.zip</spring-doc-resources.url>
<testcontainers.version>1.12.5</testcontainers.version>
<testcontainers.version>1.14.3</testcontainers.version>
<testng.version>6.14.3</testng.version>
</properties>
<scm>