From 0c74b3cd143a9d58944df2d454cb6b15a6a6f5dd Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 7 Jun 2019 12:18:54 +0100 Subject: [PATCH] Format deployment integration test source code Closes gh-17077 --- .../SampleGlassfishDeployApplicationIT.java | 5 +- .../SampleTomcatDeployApplicationIT.java | 55 ++++++------------- .../SampleTomEEDeployApplicationIT.java | 5 +- .../SampleWildFlyDeployApplicationIT.java | 5 +- .../sample/SampleWlpDeployApplicationIT.java | 5 +- 5 files changed, 26 insertions(+), 49 deletions(-) diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/src/test/java/sample/SampleGlassfishDeployApplicationIT.java b/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/src/test/java/sample/SampleGlassfishDeployApplicationIT.java index 7269982aa5..761adc8d9e 100644 --- a/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/src/test/java/sample/SampleGlassfishDeployApplicationIT.java +++ b/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/src/test/java/sample/SampleGlassfishDeployApplicationIT.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,8 +35,7 @@ public class SampleGlassfishDeployApplicationIT { public void testHome() throws Exception { String url = "http://localhost:" + this.port + "/bootapp/"; System.out.println(url); - ResponseEntity entity = new TestRestTemplate().getForEntity(url, - String.class); + ResponseEntity entity = new TestRestTemplate().getForEntity(url, String.class); assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(entity.getBody()).isEqualTo("Hello World"); } diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/src/test/java/sample/SampleTomcatDeployApplicationIT.java b/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/src/test/java/sample/SampleTomcatDeployApplicationIT.java index 1d9da3abaa..2ea507ac25 100644 --- a/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/src/test/java/sample/SampleTomcatDeployApplicationIT.java +++ b/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/src/test/java/sample/SampleTomcatDeployApplicationIT.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 the original author or authors. + * Copyright 2012-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,70 +46,51 @@ public class SampleTomcatDeployApplicationIT { } @Test - public void errorFromExceptionForRequestAcceptingAnythingProducesAJsonResponse() - throws Exception { - assertThatErrorFromExceptionProducesExpectedResponse(MediaType.ALL, - MediaType.APPLICATION_JSON); + public void errorFromExceptionForRequestAcceptingAnythingProducesAJsonResponse() throws Exception { + assertThatErrorFromExceptionProducesExpectedResponse(MediaType.ALL, MediaType.APPLICATION_JSON); } @Test - public void errorFromExceptionForRequestAcceptingJsonProducesAJsonResponse() - throws Exception { - assertThatErrorFromExceptionProducesExpectedResponse(MediaType.APPLICATION_JSON, - MediaType.APPLICATION_JSON); + public void errorFromExceptionForRequestAcceptingJsonProducesAJsonResponse() throws Exception { + assertThatErrorFromExceptionProducesExpectedResponse(MediaType.APPLICATION_JSON, MediaType.APPLICATION_JSON); } @Test - public void errorFromExceptionForRequestAcceptingHtmlProducesAnHtmlResponse() - throws Exception { - assertThatErrorFromExceptionProducesExpectedResponse(MediaType.TEXT_HTML, - MediaType.TEXT_HTML); + public void errorFromExceptionForRequestAcceptingHtmlProducesAnHtmlResponse() throws Exception { + assertThatErrorFromExceptionProducesExpectedResponse(MediaType.TEXT_HTML, MediaType.TEXT_HTML); } @Test - public void sendErrorForRequestAcceptingAnythingProducesAJsonResponse() - throws Exception { - assertThatSendErrorProducesExpectedResponse(MediaType.ALL, - MediaType.APPLICATION_JSON); + public void sendErrorForRequestAcceptingAnythingProducesAJsonResponse() throws Exception { + assertThatSendErrorProducesExpectedResponse(MediaType.ALL, MediaType.APPLICATION_JSON); } @Test public void sendErrorForRequestAcceptingJsonProducesAJsonResponse() throws Exception { - assertThatSendErrorProducesExpectedResponse(MediaType.APPLICATION_JSON, - MediaType.APPLICATION_JSON); + assertThatSendErrorProducesExpectedResponse(MediaType.APPLICATION_JSON, MediaType.APPLICATION_JSON); } @Test - public void sendErrorForRequestAcceptingHtmlProducesAnHtmlResponse() - throws Exception { - assertThatSendErrorProducesExpectedResponse(MediaType.TEXT_HTML, - MediaType.TEXT_HTML); + public void sendErrorForRequestAcceptingHtmlProducesAnHtmlResponse() throws Exception { + assertThatSendErrorProducesExpectedResponse(MediaType.TEXT_HTML, MediaType.TEXT_HTML); } - private void assertThatSendErrorProducesExpectedResponse(MediaType accept, - MediaType contentType) { + private void assertThatSendErrorProducesExpectedResponse(MediaType accept, MediaType contentType) { RequestEntity request = RequestEntity - .get(URI.create("http://localhost:" + this.port + "/bootapp/send-error")) - .accept(accept).build(); + .get(URI.create("http://localhost:" + this.port + "/bootapp/send-error")).accept(accept).build(); ResponseEntity response = this.rest.exchange(request, String.class); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR); assertThat(contentType.isCompatibleWith(response.getHeaders().getContentType())) - .as("%s is compatible with %s", contentType, - response.getHeaders().getContentType()) - .isTrue(); + .as("%s is compatible with %s", contentType, response.getHeaders().getContentType()).isTrue(); } - private void assertThatErrorFromExceptionProducesExpectedResponse(MediaType accept, - MediaType contentType) { + private void assertThatErrorFromExceptionProducesExpectedResponse(MediaType accept, MediaType contentType) { RequestEntity request = RequestEntity - .get(URI.create("http://localhost:" + this.port + "/bootapp/exception")) - .accept(accept).build(); + .get(URI.create("http://localhost:" + this.port + "/bootapp/exception")).accept(accept).build(); ResponseEntity response = this.rest.exchange(request, String.class); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR); assertThat(contentType.isCompatibleWith(response.getHeaders().getContentType())) - .as("%s is compatible with %s", contentType, - response.getHeaders().getContentType()) - .isTrue(); + .as("%s is compatible with %s", contentType, response.getHeaders().getContentType()).isTrue(); } } diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/src/test/java/sample/SampleTomEEDeployApplicationIT.java b/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/src/test/java/sample/SampleTomEEDeployApplicationIT.java index 6f0042f7cc..fad834e902 100644 --- a/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/src/test/java/sample/SampleTomEEDeployApplicationIT.java +++ b/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/src/test/java/sample/SampleTomEEDeployApplicationIT.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,8 +34,7 @@ public class SampleTomEEDeployApplicationIT { @Test public void testHome() throws Exception { String url = "http://localhost:" + this.port + "/bootapp/"; - ResponseEntity entity = new TestRestTemplate().getForEntity(url, - String.class); + ResponseEntity entity = new TestRestTemplate().getForEntity(url, String.class); assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(entity.getBody()).isEqualTo("Hello World"); } diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/src/test/java/sample/SampleWildFlyDeployApplicationIT.java b/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/src/test/java/sample/SampleWildFlyDeployApplicationIT.java index 1a2d5370bc..e648d64306 100644 --- a/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/src/test/java/sample/SampleWildFlyDeployApplicationIT.java +++ b/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/src/test/java/sample/SampleWildFlyDeployApplicationIT.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,8 +34,7 @@ public class SampleWildFlyDeployApplicationIT { @Test public void testHome() throws Exception { String url = "http://localhost:" + this.port + "/bootapp/"; - ResponseEntity entity = new TestRestTemplate().getForEntity(url, - String.class); + ResponseEntity entity = new TestRestTemplate().getForEntity(url, String.class); assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(entity.getBody()).isEqualTo("Hello World"); } diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/src/test/java/sample/SampleWlpDeployApplicationIT.java b/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/src/test/java/sample/SampleWlpDeployApplicationIT.java index 2efb441880..3aa3c27fce 100644 --- a/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/src/test/java/sample/SampleWlpDeployApplicationIT.java +++ b/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/src/test/java/sample/SampleWlpDeployApplicationIT.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,8 +34,7 @@ public class SampleWlpDeployApplicationIT { @Test public void testHome() throws Exception { String url = "http://localhost:" + this.port + "/bootapp/"; - ResponseEntity entity = new TestRestTemplate().getForEntity(url, - String.class); + ResponseEntity entity = new TestRestTemplate().getForEntity(url, String.class); assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(entity.getBody()).isEqualTo("Hello World"); }