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

Updates to boot 2.0 compatibility

Browse Source
This commit is contained in:
Spencer Gibb
2017-11-22 11:31:00 -05:00
parent 39cb6be306
commit ad9cfc665c
9 changed files with 37 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/LifecycleMvcAutoConfigurationTests.java
View File

@@ -27,96 +27,96 @@ public class LifecycleMvcAutoConfigurationTests {
@Test
public void environmentWebEndpointExtensionDisabled() {
beanNotCreated("environmentWebEndpointExtension",
"endpoints.env.enabled=false");
"management.endpoint.env.enabled=false");
}
@Test
public void environmentWebEndpointExtensionGloballyDisabled() {
beanNotCreated("environmentWebEndpointExtension",
"endpoints.default.enabled=false");
"management.endpoints.enabled-by-default=false");
}
@Test
public void environmentWebEndpointExtensionEnabled() {
beanCreated("environmentWebEndpointExtension",
"endpoints.env.enabled=true");
"management.endpoint.env.enabled=true");
}
// restartEndpoint
@Test
public void restartEndpointDisabled() {
beanNotCreated("restartEndpoint",
"endpoints.restart.enabled=false");
"management.endpoint.restart.enabled=false");
}
@Test
public void restartEndpointGloballyDisabled() {
beanNotCreated("restartEndpoint",
"endpoints.default.enabled=false");
"management.endpoint.default.enabled=false");
}
@Test
public void restartEndpointEnabled() {
beanCreatedAndEndpointEnabled("restartEndpoint", RestartEndpoint.class,
RestartEndpoint::restart,
"endpoints.restart.enabled=true");
"management.endpoint.restart.enabled=true");
}
// pauseEndpoint
@Test
public void pauseEndpointDisabled() {
beanNotCreated("pauseEndpoint",
"endpoints.pause.enabled=false");
"management.endpoint.pause.enabled=false");
}
@Test
public void pauseEndpointRestartDisabled() {
beanNotCreated("pauseEndpoint",
"endpoints.restart.enabled=false",
"endpoints.pause.enabled=true");
"management.endpoint.restart.enabled=false",
"management.endpoint.pause.enabled=true");
}
@Test
public void pauseEndpointGloballyDisabled() {
beanNotCreated("pauseEndpoint",
"endpoints.default.enabled=false");
"management.endpoint.default.enabled=false");
}
@Test
public void pauseEndpointEnabled() {
beanCreatedAndEndpointEnabled("pauseEndpoint", RestartEndpoint.PauseEndpoint.class,
RestartEndpoint.PauseEndpoint::pause,
"endpoints.restart.enabled=true",
"endpoints.pause.enabled=true");
"management.endpoint.restart.enabled=true",
"management.endpoint.pause.enabled=true");
}
// resumeEndpoint
@Test
public void resumeEndpointDisabled() {
beanNotCreated("resumeEndpoint",
"endpoints.restart.enabled=true",
"endpoints.resume.enabled=false");
"management.endpoint.restart.enabled=true",
"management.endpoint.resume.enabled=false");
}
@Test
public void resumeEndpointRestartDisabled() {
beanNotCreated("resumeEndpoint",
"endpoints.restart.enabled=false",
"endpoints.resume.enabled=true");
"management.endpoint.restart.enabled=false",
"management.endpoint.resume.enabled=true");
}
@Test
public void resumeEndpointGloballyDisabled() {
beanNotCreated("resumeEndpoint",
"endpoints.default.enabled=false");
"management.endpoint.default.enabled=false");
}
@Test
public void resumeEndpointEnabled() {
beanCreatedAndEndpointEnabled("resumeEndpoint", RestartEndpoint.ResumeEndpoint.class,
RestartEndpoint.ResumeEndpoint::resume,
"endpoints.restart.enabled=true",
"endpoints.resume.enabled=true");
"management.endpoint.restart.enabled=true",
"management.endpoint.resume.enabled=true");
}
private void beanNotCreated(String beanName, String... contextProperties) {

2
spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EnvironmentDecryptApplicationInitializerTests.java
View File

@@ -59,7 +59,7 @@ public class EnvironmentDecryptApplicationInitializerTests {
public void relaxedBinding() {
ConfigurableApplicationContext context = new AnnotationConfigApplicationContext();
TestPropertyValues.of("FOO_TEXT: {cipher}bar").applyTo(context.getEnvironment(),
TestPropertyValues.Type.SYSTEM);
TestPropertyValues.Type.SYSTEM_ENVIRONMENT);
this.listener.initialize(context);
assertEquals("bar", context.getEnvironment().getProperty("foo.text"));
}

2
spring-cloud-context/src/test/java/org/springframework/cloud/context/environment/EnvironmentManagerIntegrationTests.java
View File

@@ -48,7 +48,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@RunWith(SpringRunner.class)
@SpringBootTest(classes = TestConfiguration.class, properties = "endpoints.default.web.enabled=true")
@SpringBootTest(classes = TestConfiguration.class, properties = "management.endpoints.web.expose=*")
public class EnvironmentManagerIntegrationTests {
@Autowired

2
spring-cloud-context/src/test/java/org/springframework/cloud/context/restart/RestartIntegrationTests.java
View File

@@ -41,7 +41,7 @@ public class RestartIntegrationTests {
@Test
public void testRestartTwice() throws Exception {
context = SpringApplication.run(TestConfiguration.class, "--endpoints.restart.enabled=true", "--server.port=0");
context = SpringApplication.run(TestConfiguration.class, "--management.endpoint.restart.enabled=true", "--server.port=0");
RestartEndpoint endpoint = context.getBean(RestartEndpoint.class);
assertNotNull(context.getParent());
assertNull(context.getParent().getParent());

2
spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshEndpointIntegrationTests.java
View File

@@ -48,7 +48,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
*
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = ClientApp.class, properties = "endpoints.default.web.enabled=true", webEnvironment = RANDOM_PORT)
@SpringBootTest(classes = ClientApp.class, properties = "management.endpoints.web.expose=*", webEnvironment = RANDOM_PORT)
public class RefreshEndpointIntegrationTests {
@LocalServerPort