SpringCloud/spring-cloud-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

Browse Source 
# Conflicts:
#	spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java
#	spring-cloud-commons/src/test/java/org/springframework/cloud/client/CommonsClientAutoConfigurationTests.java
This commit is contained in:
Olga Maciaszek-Sharma
2019-02-17 17:48:28 +01:00
parent b0bd3278a5
commit ea9404ef81
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-commons/src/test/java/org/springframework/cloud/client/CommonsClientAutoConfigurationTests.java
View File

@@ -32,6 +32,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
import static org.assertj.core.api.BDDAssertions.then;
@@ -96,7 +97,7 @@ public class CommonsClientAutoConfigurationTests {
}
try (ConfigurableApplicationContext context = init(
"spring.cloud.discovery.enabled=true")) {
assertThat(context.getBean(TestBean.class), is(notNullValue()));
assertThat(context.getBean(TestBean.class)).isNotNull();
}
}
@@ -118,19 +119,20 @@ public class CommonsClientAutoConfigurationTests {
@Configuration
@EnableAutoConfiguration
@Import({NoopDiscoveryClientAutoConfiguration.class, DiscoveryEnabledConfig.class})
@Import({ NoopDiscoveryClientAutoConfiguration.class, DiscoveryEnabledConfig.class })
protected static class Config {
}
@Configuration
@ConditionalOnDiscoveryEnabled
protected static class DiscoveryEnabledConfig {
@Bean
TestBean testBean() {
return new TestBean();
}
}
private static class TestBean {