Skip to content

Commit fda86f9

Browse files
spencergibbspencergibb
committed
Merge branch '4.3.x'
2 parents aa49ce6 + 41c38ef commit fda86f9

File tree

5 files changed

+27
-53
lines changed

5 files changed

+27
-53
lines changed

‎spring-cloud-netflix-eureka-client-tls-tests/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,6 @@
103103
<scope>test</scope>
104104
</dependency>
105105

106-
<dependency>
107-
<groupId>org.junit.vintage</groupId>
108-
<artifactId>junit-vintage-engine</artifactId>
109-
<scope>test</scope>
110-
</dependency>
111106
<dependency>
112107
<groupId>org.bouncycastle</groupId>
113108
<artifactId>bcpkix-jdk15on</artifactId>

‎spring-cloud-netflix-eureka-client/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,6 @@
101101
<artifactId>spring-boot-starter-test</artifactId>
102102
<scope>test</scope>
103103
</dependency>
104-
<dependency>
105-
<groupId>org.junit.vintage</groupId>
106-
<artifactId>junit-vintage-engine</artifactId>
107-
<scope>test</scope>
108-
</dependency>
109104
<dependency>
110105
<groupId>org.springframework.cloud</groupId>
111106
<artifactId>spring-cloud-test-support</artifactId>

‎spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapConfigurationTests.java‎

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,22 @@
2525
import com.netflix.discovery.shared.transport.EurekaHttpClient;
2626
import com.netflix.discovery.shared.transport.EurekaHttpResponse;
2727
import org.apache.catalina.webresources.TomcatURLStreamHandlerFactory;
28-
import org.junit.Rule;
29-
import org.junit.Test;
30-
import org.junit.runner.RunWith;
28+
import org.junit.jupiter.api.Test;
29+
import org.junit.jupiter.api.extension.ExtendWith;
3130

3231
import org.springframework.boot.SpringBootConfiguration;
3332
import org.springframework.boot.autoconfigure.AutoConfigurations;
3433
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
3534
import org.springframework.boot.builder.SpringApplicationBuilder;
3635
import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
3736
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
38-
import org.springframework.boot.test.system.OutputCaptureRule;
37+
import org.springframework.boot.test.system.CapturedOutput;
38+
import org.springframework.boot.test.system.OutputCaptureExtension;
3939
import org.springframework.cloud.config.client.ConfigServerInstanceProvider;
4040
import org.springframework.cloud.netflix.eureka.CloudEurekaClient;
4141
import org.springframework.cloud.netflix.eureka.EurekaClientConfigBean;
4242
import org.springframework.cloud.netflix.eureka.http.RestClientEurekaHttpClient;
4343
import org.springframework.cloud.test.ClassPathExclusions;
44-
import org.springframework.cloud.test.ModifiedClassPathRunner;
4544
import org.springframework.context.annotation.Bean;
4645
import org.springframework.context.annotation.Configuration;
4746

@@ -54,102 +53,99 @@
5453
* @author Tang Xiong
5554
*/
5655
@SuppressWarnings("removal")
57-
@RunWith(ModifiedClassPathRunner.class)
56+
@ExtendWith(OutputCaptureExtension.class)
5857
@ClassPathExclusions("spring-webflux-*")
59-
public class EurekaConfigServerBootstrapConfigurationTests {
60-
61-
@Rule
62-
public OutputCaptureRule output = new OutputCaptureRule();
58+
class EurekaConfigServerBootstrapConfigurationTests {
6359

6460
@Test
65-
public void offByDefault() {
61+
void offByDefault() {
6662
new ApplicationContextRunner()
6763
.withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
6864
.run(this::assertEurekaBeansNotPresent);
6965
}
7066

7167
@Test
72-
public void properBeansCreatedWhenDiscoveryEnabled() {
68+
void properBeansCreatedWhenDiscoveryEnabled() {
7369
new ApplicationContextRunner()
7470
.withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
7571
.withPropertyValues("spring.cloud.config.discovery.enabled=true")
7672
.run(this::assertEurekaBeansPresent);
7773
}
7874

7975
@Test
80-
public void beansNotCreatedWhenDiscoveryNotEnabled() {
76+
void beansNotCreatedWhenDiscoveryNotEnabled() {
8177
new ApplicationContextRunner()
8278
.withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
8379
.withPropertyValues("spring.cloud.config.discovery.enabled=false")
8480
.run(this::assertEurekaBeansNotPresent);
8581
}
8682

8783
@Test
88-
public void beansNotCreatedWhenDiscoveryDisabled() {
84+
void beansNotCreatedWhenDiscoveryDisabled() {
8985
new ApplicationContextRunner()
9086
.withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
9187
.withPropertyValues("spring.cloud.config.discovery.disabled")
9288
.run(this::assertEurekaBeansNotPresent);
9389
}
9490

9591
@Test
96-
public void beansNotCreatedWhenEurekaClientEnabled() {
92+
void beansNotCreatedWhenEurekaClientEnabled() {
9793
new ApplicationContextRunner()
9894
.withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
9995
.withPropertyValues("eureka.client.enabled=true")
10096
.run(this::assertEurekaBeansNotPresent);
10197
}
10298

10399
@Test
104-
public void beansNotCreatedWhenEurekaClientNotEnabled() {
100+
void beansNotCreatedWhenEurekaClientNotEnabled() {
105101
new ApplicationContextRunner()
106102
.withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
107103
.withPropertyValues("eureka.client.enabled=false")
108104
.run(this::assertEurekaBeansNotPresent);
109105
}
110106

111107
@Test
112-
public void beansNotCreatedWhenEurekaClientDisabled() {
108+
void beansNotCreatedWhenEurekaClientDisabled() {
113109
new ApplicationContextRunner()
114110
.withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
115111
.withPropertyValues("eureka.client.disabled")
116112
.run(this::assertEurekaBeansNotPresent);
117113
}
118114

119115
@Test
120-
public void properBeansCreatedWhenDiscoveryEnabled_EurekaEnabled() {
116+
void properBeansCreatedWhenDiscoveryEnabled_EurekaEnabled() {
121117
new ApplicationContextRunner()
122118
.withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
123119
.withPropertyValues("spring.cloud.config.discovery.enabled=true", "eureka.client.enabled=true")
124120
.run(this::assertEurekaBeansPresent);
125121
}
126122

127123
@Test
128-
public void beansNotCreatedWhenDiscoveryEnabled_EurekaNotEnabled() {
124+
void beansNotCreatedWhenDiscoveryEnabled_EurekaNotEnabled() {
129125
new ApplicationContextRunner()
130126
.withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
131127
.withPropertyValues("spring.cloud.config.discovery.enabled=true", "eureka.client.enabled=false")
132128
.run(this::assertEurekaBeansNotPresent);
133129
}
134130

135131
@Test
136-
public void beansNotCreatedWhenDiscoveryNotEnabled_EurekaEnabled() {
132+
void beansNotCreatedWhenDiscoveryNotEnabled_EurekaEnabled() {
137133
new ApplicationContextRunner()
138134
.withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
139135
.withPropertyValues("spring.cloud.config.discovery.enabled=false", "eureka.client.enabled=true")
140136
.run(this::assertEurekaBeansNotPresent);
141137
}
142138

143139
@Test
144-
public void beansNotCreatedWhenDiscoveryNotEnabled_EurekaNotEnabled() {
140+
void beansNotCreatedWhenDiscoveryNotEnabled_EurekaNotEnabled() {
145141
new ApplicationContextRunner()
146142
.withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
147143
.withPropertyValues("spring.cloud.config.discovery.enabled=false", "eureka.client.enabled=false")
148144
.run(this::assertEurekaBeansNotPresent);
149145
}
150146

151147
@Test
152-
public void eurekaDnsConfigurationWorks() {
148+
void eurekaDnsConfigurationWorks(CapturedOutput output) {
153149
new ApplicationContextRunner()
154150
.withConfiguration(AutoConfigurations.of(EurekaConfigServerBootstrapConfiguration.class))
155151
.withPropertyValues("spring.cloud.config.discovery.enabled=true", "eureka.client.enabled=true",
@@ -161,7 +157,7 @@ public void eurekaDnsConfigurationWorks() {
161157
}
162158

163159
@Test
164-
public void eurekaConfigServerInstanceProviderCalled() {
160+
void eurekaConfigServerInstanceProviderCalled(CapturedOutput output) {
165161
// FIXME: why do I need to do this? (fails in maven build without it.
166162
TomcatURLStreamHandlerFactory.disable();
167163
new SpringApplicationBuilder(TestConfigDiscoveryConfiguration.class)
@@ -176,7 +172,7 @@ public void eurekaConfigServerInstanceProviderCalled() {
176172
}
177173

178174
@Test
179-
public void eurekaConfigServerInstanceProviderCalledWithRemoteRegions() {
175+
void eurekaConfigServerInstanceProviderCalledWithRemoteRegions(CapturedOutput output) {
180176
TomcatURLStreamHandlerFactory.disable();
181177
new SpringApplicationBuilder(TestConfigDiscoveryConfiguration.class)
182178
.properties("spring.config.use-legacy-processing=true", "spring.cloud.config.discovery.enabled=true",
@@ -190,7 +186,7 @@ public void eurekaConfigServerInstanceProviderCalledWithRemoteRegions() {
190186
}
191187

192188
@Test
193-
public void eurekaConfigServerInstanceProviderCalledWithVipAddress() {
189+
void eurekaConfigServerInstanceProviderCalledWithVipAddress(CapturedOutput output) {
194190
TomcatURLStreamHandlerFactory.disable();
195191
new SpringApplicationBuilder(TestConfigDiscoveryConfiguration.class)
196192
.properties("spring.config.use-legacy-processing=true", "spring.cloud.config.discovery.enabled=true",

‎spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaHttpClientsOptionalArgsConfigurationNoWebFluxTests.java‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,11 @@
1717
package org.springframework.cloud.netflix.eureka.config;
1818

1919
import org.apache.catalina.webresources.TomcatURLStreamHandlerFactory;
20-
import org.junit.Test;
21-
import org.junit.runner.RunWith;
20+
import org.junit.jupiter.api.Test;
2221

2322
import org.springframework.boot.builder.SpringApplicationBuilder;
24-
import org.springframework.boot.test.context.SpringBootTest;
25-
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
2623
import org.springframework.cloud.netflix.eureka.sample.EurekaSampleApplication;
2724
import org.springframework.cloud.test.ClassPathExclusions;
28-
import org.springframework.cloud.test.ModifiedClassPathRunner;
2925
import org.springframework.context.ConfigurableApplicationContext;
3026

3127
import static org.assertj.core.api.AssertionsForClassTypes.fail;
@@ -34,13 +30,11 @@
3430
/**
3531
* @author Daniel Lavoie
3632
*/
37-
@RunWith(ModifiedClassPathRunner.class)
3833
@ClassPathExclusions({ "jersey-client-*", "jersey-core-*", "jersey-apache-client4-*", "spring-webflux-*" })
39-
@SpringBootTest(classes = EurekaSampleApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT)
40-
public class EurekaHttpClientsOptionalArgsConfigurationNoWebFluxTests {
34+
class EurekaHttpClientsOptionalArgsConfigurationNoWebFluxTests {
4135

4236
@Test
43-
public void contextFailsWithoutWebClient() {
37+
void contextFailsWithoutWebClient() {
4438

4539
ConfigurableApplicationContext ctx = null;
4640
try {

‎spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaHttpClientsOptionalArgsConfigurationTests.java‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,28 +16,22 @@
1616

1717
package org.springframework.cloud.netflix.eureka.config;
1818

19-
import org.junit.Test;
20-
import org.junit.runner.RunWith;
19+
import org.junit.jupiter.api.Test;
2120

22-
import org.springframework.boot.test.context.SpringBootTest;
23-
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
2421
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
2522
import org.springframework.cloud.netflix.eureka.http.RestClientDiscoveryClientOptionalArgs;
2623
import org.springframework.cloud.netflix.eureka.http.WebClientDiscoveryClientOptionalArgs;
2724
import org.springframework.cloud.netflix.eureka.sample.EurekaSampleApplication;
2825
import org.springframework.cloud.test.ClassPathExclusions;
29-
import org.springframework.cloud.test.ModifiedClassPathRunner;
3026

3127
import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
3228

3329
/**
3430
* @author Daniel Lavoie
3531
* @author Wonchul Heo
3632
*/
37-
@RunWith(ModifiedClassPathRunner.class)
3833
@ClassPathExclusions({ "jersey-client-*", "jersey-core-*", "jersey-apache-client4-*" })
39-
@SpringBootTest(classes = EurekaSampleApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT)
40-
public class EurekaHttpClientsOptionalArgsConfigurationTests {
34+
class EurekaHttpClientsOptionalArgsConfigurationTests {
4135

4236
@Test
4337
public void contextLoadsWithRestClientWhenWebClientDisabled() {
@@ -50,7 +44,7 @@ public void contextLoadsWithRestClientWhenWebClientDisabled() {
5044
}
5145

5246
@Test
53-
public void contextLoadsWithWebClient() {
47+
void contextLoadsWithWebClient() {
5448
new WebApplicationContextRunner().withUserConfiguration(EurekaSampleApplication.class)
5549
.withPropertyValues("eureka.client.webclient.enabled=true")
5650
.run(context -> {

0 commit comments

Comments
 (0)