mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '3.1.x'
This commit is contained in:
commit
8f78acd548
@ -29,6 +29,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
|
|||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
import org.testcontainers.couchbase.BucketDefinition;
|
import org.testcontainers.couchbase.BucketDefinition;
|
||||||
import org.testcontainers.couchbase.CouchbaseContainer;
|
import org.testcontainers.couchbase.CouchbaseContainer;
|
||||||
|
import org.testcontainers.couchbase.CouchbaseService;
|
||||||
import org.testcontainers.junit.jupiter.Container;
|
import org.testcontainers.junit.jupiter.Container;
|
||||||
import org.testcontainers.junit.jupiter.Testcontainers;
|
import org.testcontainers.junit.jupiter.Testcontainers;
|
||||||
|
|
||||||
@ -51,6 +52,7 @@ class CouchbaseAutoConfigurationIntegrationTests {
|
|||||||
|
|
||||||
@Container
|
@Container
|
||||||
static final CouchbaseContainer couchbase = new CouchbaseContainer(DockerImageNames.couchbase())
|
static final CouchbaseContainer couchbase = new CouchbaseContainer(DockerImageNames.couchbase())
|
||||||
|
.withEnabledServices(CouchbaseService.KV)
|
||||||
.withCredentials("spring", "password")
|
.withCredentials("spring", "password")
|
||||||
.withStartupAttempts(5)
|
.withStartupAttempts(5)
|
||||||
.withStartupTimeout(Duration.ofMinutes(10))
|
.withStartupTimeout(Duration.ofMinutes(10))
|
||||||
@ -60,7 +62,8 @@ class CouchbaseAutoConfigurationIntegrationTests {
|
|||||||
.withConfiguration(AutoConfigurations.of(CouchbaseAutoConfiguration.class))
|
.withConfiguration(AutoConfigurations.of(CouchbaseAutoConfiguration.class))
|
||||||
.withPropertyValues("spring.couchbase.connection-string: " + couchbase.getConnectionString(),
|
.withPropertyValues("spring.couchbase.connection-string: " + couchbase.getConnectionString(),
|
||||||
"spring.couchbase.username:spring", "spring.couchbase.password:password",
|
"spring.couchbase.username:spring", "spring.couchbase.password:password",
|
||||||
"spring.couchbase.bucket.name:" + BUCKET_NAME);
|
"spring.couchbase.bucket.name:" + BUCKET_NAME, "spring.couchbase.env.timeouts.connect=2m",
|
||||||
|
"spring.couchbase.env.timeouts.key-value=1m");
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void defaultConfiguration() {
|
void defaultConfiguration() {
|
||||||
|
@ -21,6 +21,7 @@ import java.time.Duration;
|
|||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
import org.testcontainers.couchbase.BucketDefinition;
|
import org.testcontainers.couchbase.BucketDefinition;
|
||||||
import org.testcontainers.couchbase.CouchbaseContainer;
|
import org.testcontainers.couchbase.CouchbaseContainer;
|
||||||
|
import org.testcontainers.couchbase.CouchbaseService;
|
||||||
import org.testcontainers.junit.jupiter.Container;
|
import org.testcontainers.junit.jupiter.Container;
|
||||||
import org.testcontainers.junit.jupiter.Testcontainers;
|
import org.testcontainers.junit.jupiter.Testcontainers;
|
||||||
|
|
||||||
@ -54,6 +55,7 @@ class DataCouchbaseTestIntegrationTests {
|
|||||||
@Container
|
@Container
|
||||||
@ServiceConnection
|
@ServiceConnection
|
||||||
static final CouchbaseContainer couchbase = new CouchbaseContainer(DockerImageNames.couchbase())
|
static final CouchbaseContainer couchbase = new CouchbaseContainer(DockerImageNames.couchbase())
|
||||||
|
.withEnabledServices(CouchbaseService.KV, CouchbaseService.INDEX, CouchbaseService.QUERY)
|
||||||
.withStartupAttempts(5)
|
.withStartupAttempts(5)
|
||||||
.withStartupTimeout(Duration.ofMinutes(10))
|
.withStartupTimeout(Duration.ofMinutes(10))
|
||||||
.withBucket(new BucketDefinition(BUCKET_NAME));
|
.withBucket(new BucketDefinition(BUCKET_NAME));
|
||||||
|
@ -21,6 +21,7 @@ import java.time.Duration;
|
|||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
import org.testcontainers.couchbase.BucketDefinition;
|
import org.testcontainers.couchbase.BucketDefinition;
|
||||||
import org.testcontainers.couchbase.CouchbaseContainer;
|
import org.testcontainers.couchbase.CouchbaseContainer;
|
||||||
|
import org.testcontainers.couchbase.CouchbaseService;
|
||||||
import org.testcontainers.junit.jupiter.Container;
|
import org.testcontainers.junit.jupiter.Container;
|
||||||
import org.testcontainers.junit.jupiter.Testcontainers;
|
import org.testcontainers.junit.jupiter.Testcontainers;
|
||||||
|
|
||||||
@ -40,7 +41,8 @@ import static org.assertj.core.api.Assertions.assertThat;
|
|||||||
* @author Andy Wilkinson
|
* @author Andy Wilkinson
|
||||||
* @author Phillip Webb
|
* @author Phillip Webb
|
||||||
*/
|
*/
|
||||||
@DataCouchbaseTest(properties = "spring.data.couchbase.bucket-name=cbbucket")
|
@DataCouchbaseTest(properties = { "spring.data.couchbase.bucket-name=cbbucket",
|
||||||
|
"spring.couchbase.env.timeouts.connect=2m", "spring.couchbase.env.timeouts.key-value=1m" })
|
||||||
@Testcontainers(disabledWithoutDocker = true)
|
@Testcontainers(disabledWithoutDocker = true)
|
||||||
class DataCouchbaseTestReactiveIntegrationTests {
|
class DataCouchbaseTestReactiveIntegrationTests {
|
||||||
|
|
||||||
@ -49,6 +51,7 @@ class DataCouchbaseTestReactiveIntegrationTests {
|
|||||||
@Container
|
@Container
|
||||||
@ServiceConnection
|
@ServiceConnection
|
||||||
static final CouchbaseContainer couchbase = new CouchbaseContainer(DockerImageNames.couchbase())
|
static final CouchbaseContainer couchbase = new CouchbaseContainer(DockerImageNames.couchbase())
|
||||||
|
.withEnabledServices(CouchbaseService.KV, CouchbaseService.INDEX, CouchbaseService.QUERY)
|
||||||
.withStartupAttempts(5)
|
.withStartupAttempts(5)
|
||||||
.withStartupTimeout(Duration.ofMinutes(10))
|
.withStartupTimeout(Duration.ofMinutes(10))
|
||||||
.withBucket(new BucketDefinition(BUCKET_NAME));
|
.withBucket(new BucketDefinition(BUCKET_NAME));
|
||||||
|
@ -21,6 +21,7 @@ import java.time.Duration;
|
|||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
import org.testcontainers.couchbase.BucketDefinition;
|
import org.testcontainers.couchbase.BucketDefinition;
|
||||||
import org.testcontainers.couchbase.CouchbaseContainer;
|
import org.testcontainers.couchbase.CouchbaseContainer;
|
||||||
|
import org.testcontainers.couchbase.CouchbaseService;
|
||||||
import org.testcontainers.junit.jupiter.Container;
|
import org.testcontainers.junit.jupiter.Container;
|
||||||
import org.testcontainers.junit.jupiter.Testcontainers;
|
import org.testcontainers.junit.jupiter.Testcontainers;
|
||||||
|
|
||||||
@ -41,7 +42,9 @@ import static org.assertj.core.api.Assertions.assertThat;
|
|||||||
* @author Andy Wilkinson
|
* @author Andy Wilkinson
|
||||||
* @author Phillip Webb
|
* @author Phillip Webb
|
||||||
*/
|
*/
|
||||||
@DataCouchbaseTest(includeFilters = @Filter(Service.class), properties = "spring.data.couchbase.bucket-name=cbbucket")
|
@DataCouchbaseTest(includeFilters = @Filter(Service.class),
|
||||||
|
properties = { "spring.data.couchbase.bucket-name=cbbucket", "spring.couchbase.env.timeouts.connect=2m",
|
||||||
|
"spring.couchbase.env.timeouts.key-value=1m" })
|
||||||
@Testcontainers(disabledWithoutDocker = true)
|
@Testcontainers(disabledWithoutDocker = true)
|
||||||
class DataCouchbaseTestWithIncludeFilterIntegrationTests {
|
class DataCouchbaseTestWithIncludeFilterIntegrationTests {
|
||||||
|
|
||||||
@ -50,6 +53,7 @@ class DataCouchbaseTestWithIncludeFilterIntegrationTests {
|
|||||||
@Container
|
@Container
|
||||||
@ServiceConnection
|
@ServiceConnection
|
||||||
static final CouchbaseContainer couchbase = new CouchbaseContainer(DockerImageNames.couchbase())
|
static final CouchbaseContainer couchbase = new CouchbaseContainer(DockerImageNames.couchbase())
|
||||||
|
.withEnabledServices(CouchbaseService.KV, CouchbaseService.INDEX, CouchbaseService.QUERY)
|
||||||
.withStartupAttempts(5)
|
.withStartupAttempts(5)
|
||||||
.withStartupTimeout(Duration.ofMinutes(10))
|
.withStartupTimeout(Duration.ofMinutes(10))
|
||||||
.withBucket(new BucketDefinition(BUCKET_NAME));
|
.withBucket(new BucketDefinition(BUCKET_NAME));
|
||||||
|
Loading…
Reference in New Issue
Block a user