From 6fd0c80c84bc3fc66c6b7818729c67204f1366da Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Mon, 1 Oct 2018 10:46:53 -0400 Subject: [PATCH] Updates management port tests --- .../RoutePredicateHandlerMappingIntegrationTests.java | 6 +++--- .../cloud/gateway/sample/GatewaySampleApplicationTests.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/handler/RoutePredicateHandlerMappingIntegrationTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/handler/RoutePredicateHandlerMappingIntegrationTests.java index eb65ebaa..2a47ca2a 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/handler/RoutePredicateHandlerMappingIntegrationTests.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/handler/RoutePredicateHandlerMappingIntegrationTests.java @@ -34,7 +34,7 @@ import org.springframework.util.SocketUtils; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; @RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = RANDOM_PORT) +@SpringBootTest(webEnvironment = RANDOM_PORT, properties = "management.server.port=${test.port}") @DirtiesContext public class RoutePredicateHandlerMappingIntegrationTests extends BaseWebClientTests { @@ -43,12 +43,12 @@ public class RoutePredicateHandlerMappingIntegrationTests extends BaseWebClientT @BeforeClass public static void beforeClass() { managementPort = SocketUtils.findAvailableTcpPort(); - System.setProperty("management.server.port", String.valueOf(managementPort)); + System.setProperty("test.port", String.valueOf(managementPort)); } @AfterClass public static void afterClass() { - System.clearProperty("management.server.port"); + System.clearProperty("test.port"); } @Test diff --git a/spring-cloud-gateway-sample/src/test/java/org/springframework/cloud/gateway/sample/GatewaySampleApplicationTests.java b/spring-cloud-gateway-sample/src/test/java/org/springframework/cloud/gateway/sample/GatewaySampleApplicationTests.java index fa976515..c07d26d3 100644 --- a/spring-cloud-gateway-sample/src/test/java/org/springframework/cloud/gateway/sample/GatewaySampleApplicationTests.java +++ b/spring-cloud-gateway-sample/src/test/java/org/springframework/cloud/gateway/sample/GatewaySampleApplicationTests.java @@ -54,7 +54,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen */ @RunWith(SpringRunner.class) @SpringBootTest(classes = { GatewaySampleApplicationTests.TestConfig.class}, - webEnvironment = RANDOM_PORT) + webEnvironment = RANDOM_PORT, properties = "management.server.port=${test.port}") public class GatewaySampleApplicationTests { @LocalServerPort @@ -69,12 +69,12 @@ public class GatewaySampleApplicationTests { public static void beforeClass() { managementPort = SocketUtils.findAvailableTcpPort(); - System.setProperty("management.server.port", String.valueOf(managementPort)); + System.setProperty("test.port", String.valueOf(managementPort)); } @AfterClass public static void afterClass() { - System.clearProperty("management.server.port"); + System.clearProperty("test.port"); } @Before