From 52536dc291da1b3417f465d73b72d60011b53fda Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 1 Aug 2017 11:12:33 +0100 Subject: [PATCH] Update Actuator UI sample test to adapt to sensitivity removal See gh-9924 --- .../SampleActuatorUiApplicationPortTests.java | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/spring-boot-samples/spring-boot-sample-actuator-ui/src/test/java/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java b/spring-boot-samples/spring-boot-sample-actuator-ui/src/test/java/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java index 1021585365..eb307391af 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-ui/src/test/java/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator-ui/src/test/java/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java @@ -21,7 +21,9 @@ import java.util.Map; import org.junit.Test; import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.autoconfigure.LocalManagementPort; +import org.springframework.boot.autoconfigure.security.SecurityProperties; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.boot.test.web.client.TestRestTemplate; @@ -44,6 +46,9 @@ import static org.assertj.core.api.Assertions.assertThat; @DirtiesContext public class SampleActuatorUiApplicationPortTests { + @Autowired + private SecurityProperties security; + @LocalServerPort private int port = 9010; @@ -61,16 +66,23 @@ public class SampleActuatorUiApplicationPortTests { public void testMetrics() throws Exception { @SuppressWarnings("rawtypes") ResponseEntity entity = new TestRestTemplate().getForEntity( - "http://localhost:" + this.managementPort + "/application//metrics", Map.class); + "http://localhost:" + this.managementPort + "/application/metrics", + Map.class); assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.UNAUTHORIZED); } @Test public void testHealth() throws Exception { - ResponseEntity entity = new TestRestTemplate().getForEntity( - "http://localhost:" + this.managementPort + "/application//health", String.class); + ResponseEntity entity = new TestRestTemplate() + .withBasicAuth("user", getPassword()).getForEntity( + "http://localhost:" + this.managementPort + "/application/health", + String.class); assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK); - assertThat(entity.getBody()).isEqualTo("{\"status\":\"UP\"}"); + assertThat(entity.getBody()).contains("\"status\":\"UP\""); + } + + private String getPassword() { + return this.security.getUser().getPassword(); } }