iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9952 from alimate/BAEL-4579-2 

BAEL-4579: Fix the integrations tests in ribbon-client-service
This commit is contained in:
Eric Martin 2020-08-30 22:37:01 -05:00 committed by GitHub
parent 50563c7f63 5d7035cb19
commit e60f79377b
5 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
spring-cloud/spring-cloud-ribbon-retry/pom.xml
View File

@ -33,8 +33,20 @@
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
<forkCount>0</forkCount>
</configuration>
</plugin>
</plugins>
</build>
<properties> <properties>
<spring-cloud.version>Hoxton.SR3</spring-cloud.version> <spring-cloud.version>Hoxton.SR3</spring-cloud.version>
</properties> </properties>
</project> </project>

1
spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/main/resources/application.yml
View File

@ -9,6 +9,7 @@ weather-service:
ribbon: ribbon:
eureka: eureka:
enabled: false enabled: false
listOfServers: http://localhost:8021, http://localhost:8022
ServerListRefreshInterval: 5000 ServerListRefreshInterval: 5000
MaxAutoRetries: 3 MaxAutoRetries: 3
MaxAutoRetriesNextServer: 1 MaxAutoRetriesNextServer: 1

7
spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/test/java/com/baeldung/spring/cloud/ribbon/retry/RibbonRetryFailureIntegrationTest.java
View File

@ -10,7 +10,6 @@ import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import static com.baeldung.spring.cloud.ribbon.retry.TestUtils.setUpServices;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = RibbonClientApp.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = RibbonClientApp.class)
@ -25,10 +24,8 @@ public class RibbonRetryFailureIntegrationTest {
@BeforeAll @BeforeAll
public static void setup() { public static void setup() {
weatherServiceInstance1 = startApp(0); weatherServiceInstance1 = startApp(8021);
weatherServiceInstance2 = startApp(0); weatherServiceInstance2 = startApp(8022);
setUpServices(weatherServiceInstance1, weatherServiceInstance2);
} }
@AfterAll @AfterAll

7
spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/test/java/com/baeldung/spring/cloud/ribbon/retry/RibbonRetrySuccessIntegrationTest.java
View File

@ -10,7 +10,6 @@ import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import static com.baeldung.spring.cloud.ribbon.retry.TestUtils.setUpServices;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;
@ -26,10 +25,8 @@ public class RibbonRetrySuccessIntegrationTest {
@BeforeAll @BeforeAll
public static void setup() { public static void setup() {
weatherServiceInstance1 = startApp(0); weatherServiceInstance1 = startApp(8021);
weatherServiceInstance2 = startApp(0); weatherServiceInstance2 = startApp(8022);
setUpServices(weatherServiceInstance1, weatherServiceInstance2);
} }
private static ConfigurableApplicationContext startApp(int port) { private static ConfigurableApplicationContext startApp(int port) {

18
spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/test/java/com/baeldung/spring/cloud/ribbon/retry/TestUtils.java
View File

@ -1,18 +0,0 @@
package com.baeldung.spring.cloud.ribbon.retry;
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
import org.springframework.context.ConfigurableApplicationContext;
class TestUtils {
static int getWebAppPort(ConfigurableApplicationContext ctx) {
return ((AnnotationConfigServletWebServerApplicationContext) ctx).getWebServer().getPort();
}
static void setUpServices(ConfigurableApplicationContext service1, ConfigurableApplicationContext service2) {
int port1 = getWebAppPort(service1);
int port2 = getWebAppPort(service2);
String serversList = String.format("http://localhost:%d, http://localhost:%d", port1, port2);
System.setProperty("weather-service.ribbon.listOfServers", serversList);
}
}