diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/actuator-docs-index.html b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/actuator-docs-index.html index e69de29bb2..8b13789179 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/actuator-docs-index.html +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/actuator-docs-index.html @@ -0,0 +1 @@ + diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/db/migration/V1__init.sql b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/db/migration/V1__init.sql index e69de29bb2..8b13789179 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/db/migration/V1__init.sql +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/db/migration/V1__init.sql @@ -0,0 +1 @@ + diff --git a/spring-boot-project/spring-boot-actuator/src/test/resources/actuator-docs-index.html b/spring-boot-project/spring-boot-actuator/src/test/resources/actuator-docs-index.html index e69de29bb2..8b13789179 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/resources/actuator-docs-index.html +++ b/spring-boot-project/spring-boot-actuator/src/test/resources/actuator-docs-index.html @@ -0,0 +1 @@ + diff --git a/spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V1__init.sql b/spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V1__init.sql index e69de29bb2..8b13789179 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V1__init.sql +++ b/spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V1__init.sql @@ -0,0 +1 @@ + diff --git a/spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V2__update.sql b/spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V2__update.sql index e69de29bb2..8b13789179 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V2__update.sql +++ b/spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V2__update.sql @@ -0,0 +1 @@ + diff --git a/spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V3__update.sql b/spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V3__update.sql index e69de29bb2..8b13789179 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V3__update.sql +++ b/spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V3__update.sql @@ -0,0 +1 @@ + diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java index 8cc0079cb0..bd718f4347 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java @@ -73,7 +73,7 @@ public class ThymeleafReactiveAutoConfigurationTests { load(BaseConfiguration.class, "spring.thymeleaf.suffix:.html"); TemplateEngine engine = this.context.getBean(TemplateEngine.class); Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar")); - String result = engine.process("template", attrs); + String result = engine.process("template", attrs).trim(); assertThat(result).isEqualTo("bar"); } @@ -176,7 +176,7 @@ public class ThymeleafReactiveAutoConfigurationTests { ISpringWebFluxTemplateEngine engine = this.context .getBean(ISpringWebFluxTemplateEngine.class); Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar")); - String result = engine.process("data-dialect", attrs); + String result = engine.process("data-dialect", attrs).trim(); assertThat(result).isEqualTo(""); } @@ -186,7 +186,7 @@ public class ThymeleafReactiveAutoConfigurationTests { ISpringWebFluxTemplateEngine engine = this.context .getBean(ISpringWebFluxTemplateEngine.class); Context attrs = new Context(Locale.UK); - String result = engine.process("java8time-dialect", attrs); + String result = engine.process("java8time-dialect", attrs).trim(); assertThat(result).isEqualTo("2015-11-24"); } @@ -196,7 +196,7 @@ public class ThymeleafReactiveAutoConfigurationTests { ISpringWebFluxTemplateEngine engine = this.context .getBean(ISpringWebFluxTemplateEngine.class); Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar")); - String result = engine.process("home", attrs); + String result = engine.process("home", attrs).trim(); assertThat(result).isEqualTo("bar"); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java index af30236afd..e313cb896e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java @@ -89,7 +89,7 @@ public class ThymeleafServletAutoConfigurationTests { "spring.thymeleaf.suffix:"); TemplateEngine engine = this.context.getBean(TemplateEngine.class); Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar")); - String result = engine.process("template.html", attrs); + String result = engine.process("template.html", attrs).trim(); assertThat(result).isEqualTo("bar"); } @@ -172,7 +172,7 @@ public class ThymeleafServletAutoConfigurationTests { load(BaseConfiguration.class); TemplateEngine engine = this.context.getBean(TemplateEngine.class); Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar")); - String result = engine.process("data-dialect", attrs); + String result = engine.process("data-dialect", attrs).trim(); assertThat(result).isEqualTo(""); } @@ -181,7 +181,7 @@ public class ThymeleafServletAutoConfigurationTests { load(BaseConfiguration.class); TemplateEngine engine = this.context.getBean(TemplateEngine.class); Context attrs = new Context(Locale.UK); - String result = engine.process("java8time-dialect", attrs); + String result = engine.process("java8time-dialect", attrs).trim(); assertThat(result).isEqualTo("2015-11-24"); } @@ -190,7 +190,7 @@ public class ThymeleafServletAutoConfigurationTests { load(BaseConfiguration.class); TemplateEngine engine = this.context.getBean(TemplateEngine.class); Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar")); - String result = engine.process("home", attrs); + String result = engine.process("home", attrs).trim(); assertThat(result).isEqualTo("bar"); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/mappings/non-annotated.xml b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/mappings/non-annotated.xml index 9794316839..db6bee3319 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/mappings/non-annotated.xml +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/mappings/non-annotated.xml @@ -15,4 +15,4 @@ - \ No newline at end of file + diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/city.sql b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/city.sql index 9e0cd1cd79..eb08623b4c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/city.sql +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/city.sql @@ -1 +1 @@ -INSERT INTO CITY (ID, NAME, STATE, COUNTRY, MAP) values (2000, 'Washington', 'DC', 'US', 'Google'); \ No newline at end of file +INSERT INTO CITY (ID, NAME, STATE, COUNTRY, MAP) values (2000, 'Washington', 'DC', 'US', 'Google'); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.html index e69de29bb2..8b13789179 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.html +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.html @@ -0,0 +1 @@ + diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/migration/V1__init.sql b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/migration/V1__init.sql index e69de29bb2..8b13789179 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/migration/V1__init.sql +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/migration/V1__init.sql @@ -0,0 +1 @@ + diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/non-annotated-data.sql b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/non-annotated-data.sql index 481cd974ac..709bc377bc 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/non-annotated-data.sql +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/non-annotated-data.sql @@ -1 +1 @@ -INSERT INTO NON_ANNOTATED (ID, VALUE) values (2000, 'Test'); \ No newline at end of file +INSERT INTO NON_ANNOTATED (ID, VALUE) values (2000, 'Test'); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/vendors/h2/V1__init.sql b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/vendors/h2/V1__init.sql index e69de29bb2..8b13789179 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/vendors/h2/V1__init.sql +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/vendors/h2/V1__init.sql @@ -0,0 +1 @@ + diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo_de.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo_de.html index e69de29bb2..8b13789179 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo_de.html +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo_de.html @@ -0,0 +1 @@ + diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/error/error.mustache b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/error/error.mustache index 42eec03b12..c29c825d82 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/error/error.mustache +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/error/error.mustache @@ -1,8 +1,8 @@ - \ No newline at end of file + diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/template.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/template.html index 294ec94e2d..123f6966f7 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/template.html +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/template.html @@ -1 +1 @@ -foo \ No newline at end of file +foo diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/welcome-page/index.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/welcome-page/index.html index e69de29bb2..8b13789179 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/welcome-page/index.html +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/welcome-page/index.html @@ -0,0 +1 @@ + diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/service.wsdl b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/service.wsdl index 7daeeabdc1..639bba0139 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/service.wsdl +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/service.wsdl @@ -1,10 +1,10 @@ - + - + @@ -23,7 +23,7 @@ + transport="https://schemas.xmlsoap.org/soap/http/" /> @@ -40,4 +40,3 @@ - diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/types.xsd b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/types.xsd index a289fe8d10..dc559d26b7 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/types.xsd +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/types.xsd @@ -1,7 +1,7 @@ + targetNamespace="https://www.springframework.org/spring-ws/wsdl/schemas"> diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/two/.file b/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/two/.file index e69de29bb2..8b13789179 100644 --- a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/two/.file +++ b/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/two/.file @@ -0,0 +1 @@ + diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/resources/example.script b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/resources/example.script index 15c36f50ef..6ac867af71 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/resources/example.script +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/resources/example.script @@ -1 +1 @@ -FOO=BAR \ No newline at end of file +FOO=BAR diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/resources/root/META-INF/MANIFEST.MF b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/resources/root/META-INF/MANIFEST.MF index e69de29bb2..8b13789179 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/resources/root/META-INF/MANIFEST.MF +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/resources/root/META-INF/MANIFEST.MF @@ -0,0 +1 @@ + diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/result/view/MustacheViewTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/result/view/MustacheViewTests.java index 2de80b931b..1a4512c8bd 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/result/view/MustacheViewTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/result/view/MustacheViewTests.java @@ -62,7 +62,7 @@ public class MustacheViewTests { view.render(Collections.singletonMap("World", "Spring"), MediaType.TEXT_HTML, this.exchange).block(Duration.ofSeconds(30)); assertThat(this.exchange.getResponse().getBodyAsString() - .block(Duration.ofSeconds(30))).isEqualTo("Hello Spring"); + .block(Duration.ofSeconds(30)).trim()).isEqualTo("Hello Spring"); } } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/view/MustacheViewTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/view/MustacheViewTests.java index aec312fc51..546ff90607 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/view/MustacheViewTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/view/MustacheViewTests.java @@ -64,7 +64,7 @@ public class MustacheViewTests { view.setApplicationContext(this.context); view.render(Collections.singletonMap("World", "Spring"), this.request, this.response); - assertThat(this.response.getContentAsString()).isEqualTo("Hello Spring"); + assertThat(this.response.getContentAsString().trim()).isEqualTo("Hello Spring"); } } diff --git a/spring-boot-project/spring-boot/src/test/resources/META-INF/spring.factories b/spring-boot-project/spring-boot/src/test/resources/META-INF/spring.factories index 2808910570..7be3145156 100644 --- a/spring-boot-project/spring-boot/src/test/resources/META-INF/spring.factories +++ b/spring-boot-project/spring-boot/src/test/resources/META-INF/spring.factories @@ -1,3 +1,3 @@ org.springframework.boot.env.PropertySourceLoader=\ org.springframework.boot.context.config.TestPropertySourceLoader1,\ -org.springframework.boot.context.config.TestPropertySourceLoader2 \ No newline at end of file +org.springframework.boot.context.config.TestPropertySourceLoader2 diff --git a/spring-boot-project/spring-boot/src/test/resources/application-withwebapplicationtype.yml b/spring-boot-project/spring-boot/src/test/resources/application-withwebapplicationtype.yml index 9c913ff8db..1556b9eca1 100644 --- a/spring-boot-project/spring-boot/src/test/resources/application-withwebapplicationtype.yml +++ b/spring-boot-project/spring-boot/src/test/resources/application-withwebapplicationtype.yml @@ -1 +1 @@ -spring.main.web-application-type: reactive \ No newline at end of file +spring.main.web-application-type: reactive diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/reactive/result/view/template.html b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/reactive/result/view/template.html index 18624afa99..fa22264e23 100644 --- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/reactive/result/view/template.html +++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/reactive/result/view/template.html @@ -1 +1 @@ -Hello {{World}} \ No newline at end of file +Hello {{World}} diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/servlet/view/template.html b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/servlet/view/template.html index 18624afa99..fa22264e23 100644 --- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/servlet/view/template.html +++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/servlet/view/template.html @@ -1 +1 @@ -Hello {{World}} \ No newline at end of file +Hello {{World}} diff --git a/spring-boot-project/spring-boot/src/test/resources/testnegatedprofiles.yml b/spring-boot-project/spring-boot/src/test/resources/testnegatedprofiles.yml index a015a0749e..79e1a4367d 100644 --- a/spring-boot-project/spring-boot/src/test/resources/testnegatedprofiles.yml +++ b/spring-boot-project/spring-boot/src/test/resources/testnegatedprofiles.yml @@ -17,4 +17,4 @@ spring: profiles: "!other" my: property: fromnototherprofile - notother: foo \ No newline at end of file + notother: foo diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-double-link-single-java-opt.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-double-link-single-java-opt.sh index 9f1f5c404d..6895c0d061 100755 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-double-link-single-java-opt.sh +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-double-link-single-java-opt.sh @@ -3,4 +3,4 @@ install_double_link_service echo 'JAVA_OPTS=-Dserver.port=8081' > /test-service/spring-boot-app.conf start_service await_app http://127.0.0.1:8081/ -curl -s http://127.0.0.1:8081/ \ No newline at end of file +curl -s http://127.0.0.1:8081/