From 7fd55be4b3e5226a61f65dcedad62468802e16bb Mon Sep 17 00:00:00 2001 From: "wenqi.huang" Date: Thu, 11 Apr 2019 18:28:09 +0800 Subject: [PATCH] Add more tests for @ConditionalOnRefreshScope --- .../eureka/ConditionalOnRefreshScopeTests.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/ConditionalOnRefreshScopeTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/ConditionalOnRefreshScopeTests.java index 93487293c..7118fa89d 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/ConditionalOnRefreshScopeTests.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/ConditionalOnRefreshScopeTests.java @@ -20,6 +20,7 @@ import org.junit.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.cloud.autoconfigure.RefreshAutoConfiguration; +import org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration.ConditionalOnMissingRefreshScope; import org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration.ConditionalOnRefreshScope; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -40,6 +41,7 @@ public class ConditionalOnRefreshScopeTests { assertThat(c).hasSingleBean( org.springframework.cloud.context.scope.refresh.RefreshScope.class); assertThat(c.getBean("foo")).isEqualTo("foo"); + assertThat(c).doesNotHaveBean("bar"); }); } @@ -52,6 +54,7 @@ public class ConditionalOnRefreshScopeTests { assertThat(c).hasSingleBean( org.springframework.cloud.context.scope.refresh.RefreshScope.class); assertThat(c).doesNotHaveBean("foo"); + assertThat(c.getBean("bar")).isEqualTo("bar"); }); } @@ -59,6 +62,14 @@ public class ConditionalOnRefreshScopeTests { public void refreshScopeNotIncluded() { new ApplicationContextRunner().withUserConfiguration(Beans.class).run(c -> { assertThat(c).doesNotHaveBean("foo"); + assertThat(c.getBean("bar")).isEqualTo("bar"); + }); + + new ApplicationContextRunner().withUserConfiguration(Beans.class) + .withPropertyValues("eureka.client.refresh.enable=false") + .run(c -> { + assertThat(c).doesNotHaveBean("foo"); + assertThat(c.getBean("bar")).isEqualTo("bar"); }); } @@ -69,6 +80,12 @@ public class ConditionalOnRefreshScopeTests { public String foo() { return "foo"; } + + @Bean + @ConditionalOnMissingRefreshScope + public String bar() { + return "bar"; + } } }