From 664ecbdcc18d661db298bfe7f6255dfef33a5d07 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 24 Feb 2022 11:51:46 +0000 Subject: [PATCH] Polish "Add DataCouchbaseTest annotation" See gh-29912 --- .../src/docs/asciidoc/anchor-rewrite.properties | 1 - .../src/docs/asciidoc/features/testing.adoc | 2 +- .../autoconfigure/data/couchbase/DataCouchbaseTest.java | 6 +++--- .../DataCouchbaseTestReactiveIntegrationTests.java | 4 ---- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/anchor-rewrite.properties b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/anchor-rewrite.properties index 51247f2411..7f7b5c612d 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/anchor-rewrite.properties +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/anchor-rewrite.properties @@ -339,7 +339,6 @@ boot-features-testing-spring-boot-applications-testing-autoconfigured-json-tests boot-features-testing-spring-boot-applications-testing-autoconfigured-mvc-tests=features.testing.spring-boot-applications.spring-mvc-tests boot-features-testing-spring-boot-applications-testing-autoconfigured-webflux-tests=features.testing.spring-boot-applications.spring-webflux-tests boot-features-testing-spring-boot-applications-testing-autoconfigured-cassandra-test=features.testing.spring-boot-applications.autoconfigured-spring-data-cassandra -boot-features-testing-spring-boot-applications-testing-autoconfigured-couchbase-test=features.testing.spring-boot-applications.autoconfigured-spring-data-couchbase boot-features-testing-spring-boot-applications-testing-autoconfigured-jpa-test=features.testing.spring-boot-applications.autoconfigured-spring-data-jpa boot-features-testing-spring-boot-applications-testing-autoconfigured-jdbc-test=features.testing.spring-boot-applications.autoconfigured-jdbc boot-features-testing-spring-boot-applications-testing-autoconfigured-data-jdbc-test=features.testing.spring-boot-applications.autoconfigured-spring-data-jdbc diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/testing.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/testing.adoc index 2fe2842b13..772ffa4740 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/testing.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/testing.adoc @@ -475,7 +475,7 @@ include::code:MyDataCassandraTests[] [[features.testing.spring-boot-applications.autoconfigured-spring-data-couchbase]] ==== Auto-configured Data Couchbase Tests You can use `@DataCouchbaseTest` to test Couchbase applications. -By default, it configures a `CouchbaseTemplate`, scans for `@Document` classes, and configures Spring Data Couchbase repositories. +By default, it configures a `CouchbaseTemplate` or `ReactiveCouchbaseTemplate`, scans for `@Document` classes, and configures Spring Data Couchbase repositories. Regular `@Component` and `@ConfigurationProperties` beans are not scanned when the `@DataCouchbaseTest` annotation is used. `@EnableConfigurationProperties` can be used to include `@ConfigurationProperties` beans. (For more about using Couchbase with Spring Boot, see "<>", earlier in this chapter.) diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/couchbase/DataCouchbaseTest.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/couchbase/DataCouchbaseTest.java index f3aa83469a..0e52d6f661 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/couchbase/DataCouchbaseTest.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/data/couchbase/DataCouchbaseTest.java @@ -37,11 +37,11 @@ import org.springframework.test.context.BootstrapWith; import org.springframework.test.context.junit.jupiter.SpringExtension; /** - * Annotation that can be used for a Couchbase test that focuses only on - * Couchbase components. + * Annotation that can be used for a Data Couchbase test that focuses + * only on Data Couchbase components. *

* Using this annotation will disable full auto-configuration and instead apply only - * configuration relevant to Couchbase tests. + * configuration relevant to Data Couchbase tests. *

* When using JUnit 4, this annotation should be used in combination with * {@code @RunWith(SpringRunner.class)}. diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/couchbase/DataCouchbaseTestReactiveIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/couchbase/DataCouchbaseTestReactiveIntegrationTests.java index b300f33603..8ce3bc0e9b 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/couchbase/DataCouchbaseTestReactiveIntegrationTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/couchbase/DataCouchbaseTestReactiveIntegrationTests.java @@ -26,7 +26,6 @@ import org.testcontainers.junit.jupiter.Testcontainers; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.testsupport.testcontainers.DockerImageNames; -import org.springframework.context.ApplicationContext; import org.springframework.data.couchbase.core.ReactiveCouchbaseTemplate; import org.springframework.test.context.DynamicPropertyRegistry; import org.springframework.test.context.DynamicPropertySource; @@ -64,9 +63,6 @@ class DataCouchbaseTestReactiveIntegrationTests { @Autowired private ExampleReactiveRepository exampleReactiveRepository; - @Autowired - private ApplicationContext applicationContext; - @Test void testRepository() { ExampleDocument document = new ExampleDocument();