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

Merge branch '3.0.x'

Browse Source
This commit is contained in:
spencergibb
2021-07-29 10:50:27 -04:00
parent 59deb14e38 247832e106
commit 432eaa0d76
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaHttpClientsOptionalArgsConfigurationNoWebfluxTest.java
View File

@@ -37,11 +37,11 @@ import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
@RunWith(ModifiedClassPathRunner.class)
@ClassPathExclusions({ "jersey-client-*", "jersey-core-*", "jersey-apache-client4-*", "spring-webflux-*" })
@SpringBootTest(classes = EurekaSampleApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT)
class EurekaHttpClientsOptionalArgsConfigurationNoWebfluxTest {
public class EurekaHttpClientsOptionalArgsConfigurationNoWebfluxTest {
@Test
@SuppressWarnings("unchecked")
void contextFailsWithoutWebClient() {
public void contextFailsWithoutWebClient() {
ConfigurableApplicationContext ctx = null;
try {

8
spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaHttpClientsOptionalArgsConfigurationTest.java
View File

@@ -36,10 +36,10 @@ import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
@RunWith(ModifiedClassPathRunner.class)
@ClassPathExclusions({ "jersey-client-*", "jersey-core-*", "jersey-apache-client4-*" })
@SpringBootTest(classes = EurekaSampleApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT)
class EurekaHttpClientsOptionalArgsConfigurationTest {
public class EurekaHttpClientsOptionalArgsConfigurationTest {
@Test
void contextLoadsWithRestTemplate() {
public void contextLoadsWithRestTemplate() {
new WebApplicationContextRunner().withUserConfiguration(EurekaSampleApplication.class)
.withPropertyValues("eureka.client.webclient.enabled=false").run(context -> {
assertThat(context).hasSingleBean(RestTemplateDiscoveryClientOptionalArgs.class);
@@ -48,7 +48,7 @@ class EurekaHttpClientsOptionalArgsConfigurationTest {
}
@Test
void contextLoadsWithWebClient() {
public void contextLoadsWithWebClient() {
new WebApplicationContextRunner().withUserConfiguration(EurekaSampleApplication.class)
.withPropertyValues("eureka.client.webclient.enabled=true").run(context -> {
assertThat(context).doesNotHaveBean(RestTemplateDiscoveryClientOptionalArgs.class);
@@ -57,7 +57,7 @@ class EurekaHttpClientsOptionalArgsConfigurationTest {
}
@Test
void contextLoadsWithRestTemplateAsDefault() {
public void contextLoadsWithRestTemplateAsDefault() {
new WebApplicationContextRunner().withUserConfiguration(EurekaSampleApplication.class).run(context -> {
assertThat(context).hasSingleBean(RestTemplateDiscoveryClientOptionalArgs.class);
assertThat(context).doesNotHaveBean(WebClientDiscoveryClientOptionalArgs.class);