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 e69de29bb2d..8b137891791 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 e69de29bb2d..8b137891791 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 e69de29bb2d..8b137891791 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 e69de29bb2d..8b137891791 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 e69de29bb2d..8b137891791 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 e69de29bb2d..8b137891791 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 8cc0079cb07..bd718f4347c 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 af30236afdc..e313cb896e0 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 97943168397..db6bee33194 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 9e0cd1cd79c..eb08623b4cf 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 e69de29bb2d..8b137891791 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 e69de29bb2d..8b137891791 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 481cd974acd..709bc377bcc 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 e69de29bb2d..8b137891791 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 e69de29bb2d..8b137891791 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 42eec03b127..c29c825d826 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 @@