From 971913e672e0c0ea9f5f5d30f5e979597596663f Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 17 Jun 2016 21:01:29 +0100 Subject: [PATCH] Polish --- ...EndpointServerContextPathIntegrationTests.java | 9 ++++----- .../ElasticsearchJestHealthIndicatorTests.java | 15 ++++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HalBrowserMvcEndpointServerContextPathIntegrationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HalBrowserMvcEndpointServerContextPathIntegrationTests.java index b294e962eab..3748f8cc3c8 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HalBrowserMvcEndpointServerContextPathIntegrationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HalBrowserMvcEndpointServerContextPathIntegrationTests.java @@ -84,11 +84,10 @@ public class HalBrowserMvcEndpointServerContextPathIntegrationTests { HttpHeaders headers = new HttpHeaders(); headers.setAccept(Arrays.asList(MediaType.TEXT_HTML)); ResponseEntity entity = new TestRestTemplate().exchange( - "http://localhost:" + this.port + "/spring/actuator/browser.html", HttpMethod.GET, - new HttpEntity(null, headers), String.class); - assertEquals(HttpStatus.OK, entity.getStatusCode()); - assertTrue("Wrong body: " + entity.getBody(), - entity.getBody().contains("entryPoint: '/spring/actuator'")); + "http://localhost:" + this.port + "/spring/actuator/browser.html", + HttpMethod.GET, new HttpEntity(null, headers), String.class); + assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK); + assertThat(entity.getBody()).contains("entryPoint: '/spring/actuator'"); } @Test diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/ElasticsearchJestHealthIndicatorTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/ElasticsearchJestHealthIndicatorTests.java index 2724b8d6537..93548211e9a 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/ElasticsearchJestHealthIndicatorTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/ElasticsearchJestHealthIndicatorTests.java @@ -41,9 +41,10 @@ public class ElasticsearchJestHealthIndicatorTests { private final JestClient jestClient = mock(JestClient.class); - private final ElasticsearchJestHealthIndicator healthIndicator = - new ElasticsearchJestHealthIndicator(this.jestClient); + private final ElasticsearchJestHealthIndicator healthIndicator = new ElasticsearchJestHealthIndicator( + this.jestClient); + @SuppressWarnings("unchecked") @Test public void elasticSearchIsUp() throws IOException { given(this.jestClient.execute(any(Action.class))) @@ -52,6 +53,8 @@ public class ElasticsearchJestHealthIndicatorTests { Health health = this.healthIndicator.health(); assertThat(health.getStatus()).isEqualTo(Status.UP); } + + @SuppressWarnings("unchecked") @Test public void elasticSearchIsDown() throws IOException { given(this.jestClient.execute(any(Action.class))).willThrow( @@ -61,6 +64,7 @@ public class ElasticsearchJestHealthIndicatorTests { assertThat(health.getStatus()).isEqualTo(Status.DOWN); } + @SuppressWarnings("unchecked") @Test public void elasticSearchIsOutOfService() throws IOException { given(this.jestClient.execute(any(Action.class))) @@ -71,11 +75,8 @@ public class ElasticsearchJestHealthIndicatorTests { } private static JestResult createJestResult(int shards, int failedShards) { - String json = String.format("{_shards: {\n" + - "total: %s,\n" + - "successful: %s,\n" + - "failed: %s\n" + - "}}", shards, shards - failedShards, failedShards); + String json = String.format("{_shards: {\n" + "total: %s,\n" + "successful: %s,\n" + + "failed: %s\n" + "}}", shards, shards - failedShards, failedShards); SearchResult searchResult = new SearchResult(new Gson()); searchResult.setJsonString(json);