From 89054d32fa4ea7c220bd4b005561728ac342c543 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 27 Nov 2017 10:59:21 +0100 Subject: [PATCH] Polish "Fix CouchbaseReactiveRepositoriesAutoConfigurationTests" Closes gh-11151 --- ...chbaseReactiveRepositoriesAutoConfigurationTests.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveRepositoriesAutoConfigurationTests.java index 600659bec2..fe0a4e89ba 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveRepositoriesAutoConfigurationTests.java @@ -23,6 +23,7 @@ import org.springframework.boot.autoconfigure.TestAutoConfigurationPackage; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.autoconfigure.couchbase.CouchbaseAutoConfiguration; import org.springframework.boot.autoconfigure.couchbase.CouchbaseTestConfigurer; +import org.springframework.boot.autoconfigure.data.alt.couchbase.CityCouchbaseRepository; import org.springframework.boot.autoconfigure.data.alt.couchbase.ReactiveCityCouchbaseRepository; import org.springframework.boot.autoconfigure.data.couchbase.city.City; import org.springframework.boot.autoconfigure.data.couchbase.city.ReactiveCityRepository; @@ -31,7 +32,7 @@ import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; -import org.springframework.data.couchbase.repository.config.EnableReactiveCouchbaseRepositories; +import org.springframework.data.couchbase.repository.config.EnableCouchbaseRepositories; import static org.assertj.core.api.Assertions.assertThat; @@ -81,7 +82,7 @@ public class CouchbaseReactiveRepositoriesAutoConfigurationTests { public void doesNotTriggerDefaultRepositoryDetectionIfCustomized() { load(CustomizedConfiguration.class); assertThat(this.context.getBeansOfType(ReactiveCityCouchbaseRepository.class)) - .isNotNull(); + .isEmpty(); } private void load(Class config, String... environment) { @@ -115,8 +116,8 @@ public class CouchbaseReactiveRepositoriesAutoConfigurationTests { @Configuration @TestAutoConfigurationPackage(CouchbaseReactiveRepositoriesAutoConfigurationTests.class) - @EnableReactiveCouchbaseRepositories(basePackageClasses = ReactiveCityCouchbaseRepository.class) - @Import(CouchbaseTestConfigurer.class) + @EnableCouchbaseRepositories(basePackageClasses = CityCouchbaseRepository.class) + @Import(CouchbaseDataAutoConfigurationTests.CustomCouchbaseConfiguration.class) protected static class CustomizedConfiguration { }