Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-08-29 03:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.7.x' into 3.0.x

Browse Source
This commit is contained in:
Moritz Halbritter 2023-09-05 15:21:51 +02:00
commit a69ff3bd59
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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() {

2
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/couchbase/DataCouchbaseTestIntegrationTests.java
View File

@ -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;
@ -49,6 +50,7 @@ class DataCouchbaseTestIntegrationTests {
@Container @Container
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));

5
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/couchbase/DataCouchbaseTestReactiveIntegrationTests.java
View File

@ -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;
@ -38,7 +39,8 @@ import static org.assertj.core.api.Assertions.assertThat;
* *
* @author Eddú Meléndez * @author Eddú Meléndez
*/ */
@DataCouchbaseTest @DataCouchbaseTest(
properties = { "spring.couchbase.env.timeouts.connect=2m", "spring.couchbase.env.timeouts.key-value=1m" })
@Testcontainers(disabledWithoutDocker = true) @Testcontainers(disabledWithoutDocker = true)
class DataCouchbaseTestReactiveIntegrationTests { class DataCouchbaseTestReactiveIntegrationTests {
@ -46,6 +48,7 @@ class DataCouchbaseTestReactiveIntegrationTests {
@Container @Container
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));

6
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/couchbase/DataCouchbaseTestWithIncludeFilterIntegrationTests.java
View File

@ -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;
@ -39,7 +40,9 @@ import static org.assertj.core.api.Assertions.assertThat;
* *
* @author Eddú Meléndez * @author Eddú Meléndez
*/ */
@DataCouchbaseTest(includeFilters = @Filter(Service.class)) @DataCouchbaseTest(
properties = { "spring.couchbase.env.timeouts.connect=2m", "spring.couchbase.env.timeouts.key-value=1m" },
includeFilters = @Filter(Service.class))
@Testcontainers(disabledWithoutDocker = true) @Testcontainers(disabledWithoutDocker = true)
class DataCouchbaseTestWithIncludeFilterIntegrationTests { class DataCouchbaseTestWithIncludeFilterIntegrationTests {
@ -47,6 +50,7 @@ class DataCouchbaseTestWithIncludeFilterIntegrationTests {
@Container @Container
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));