Skip to content

S
spring-boot
Commit b442d3b9 authored by Phillip Webb's avatar Phillip Webb
Browse files
Options

Merge branch '1.5.x' into 2.0.x

parents 5fba43aa 80d8a5cf
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 32 deletions
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java
View file @ b442d3b9
......@@ -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("<html>bar</html>");
}
......@@ -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("<html><body data-foo=\"bar\"></body></html>");
}
......@@ -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("<html><body>2015-11-24</body></html>");
}
......@@ -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("<html><body>bar</body></html>");
}
......
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java
View file @ b442d3b9
......@@ -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("<html>bar</html>");
}
......@@ -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("<html><body data-foo=\"bar\"></body></html>");
}
......@@ -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("<html><body>2015-11-24</body></html>");
}
......@@ -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("<html><body>bar</body></html>");
}
......
spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/mappings/non-annotated.xml
View file @ b442d3b9
......@@ -15,4 +15,4 @@
</basic>
</attributes>
</entity>
</entity-mappings>
\ No newline at end of file
</entity-mappings>
spring-boot-project/spring-boot-autoconfigure/src/test/resources/city.sql
View file @ b442d3b9
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');
spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/non-annotated-data.sql
View file @ b442d3b9
INSERT INTO NON_ANNOTATED (ID, VALUE) values (2000, 'Test');
\ No newline at end of file
INSERT INTO NON_ANNOTATED (ID, VALUE) values (2000, 'Test');
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/error/error.mustache
View file @ b442d3b9
<html>
<body>
<ul>
<li>status: {{status}}</li>
<li>message: {{message}}</li>
<li>status: {{status}}</li>
<li>message: {{message}}</li>
</ul>
</body>
</html>
\ No newline at end of file
</html>
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/template.html
View file @ b442d3b9
<html th:text="${foo}">foo</html>
\ No newline at end of file
<html th:text="${foo}">foo</html>
spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/service.wsdl
View file @ b442d3b9
<?xml version="1.0" encoding="UTF-8"?>
<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:tns="http://www.springframework.org/spring-ws/wsdl"
xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" targetNamespace="http://www.springframework.org/spring-ws/wsdl">
<wsdl:definitions xmlns:wsdl="https://schemas.xmlsoap.org/wsdl/"
xmlns:tns="https://www.springframework.org/spring-ws/wsdl"
xmlns:wsdlsoap="https://schemas.xmlsoap.org/wsdl/soap/" targetNamespace="https://www.springframework.org/spring-ws/wsdl">
<wsdl:types>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified" targetNamespace="http://www.springframework.org/spring-ws/wsdl">
<xsd:schema xmlns:xsd="https://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified" targetNamespace="https://www.springframework.org/spring-ws/wsdl">
<xsd:element name="request" type="xsd:string" />
<xsd:element name="response" type="xsd:string" />
</xsd:schema>
......@@ -23,7 +23,7 @@
</wsdl:portType>
<wsdl:binding name="binding" type="tns:portType">
<wsdlsoap:binding style="document"
transport="http://schemas.xmlsoap.org/soap/http/" />
transport="https://schemas.xmlsoap.org/soap/http/" />
<wsdl:operation name="operation">
<wsdlsoap:operation soapAction="" />
<wsdl:input name="request">
......@@ -40,4 +40,3 @@
</wsdl:port>
</wsdl:service>
</wsdl:definitions>
spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/types.xsd
View file @ b442d3b9
<?xml version="1.0" encoding="UTF-8"?>
<schema xmlns="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
targetNamespace="http://www.springframework.org/spring-ws/wsdl/schemas">
targetNamespace="https://www.springframework.org/spring-ws/wsdl/schemas">
<element name="request" type="string" />
<element name="response" type="string" />
</schema>
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/result/view/MustacheViewTests.java
View file @ b442d3b9
......@@ -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");
}
}
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/view/MustacheViewTests.java
View file @ b442d3b9
......@@ -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");
}
}
spring-boot-project/spring-boot/src/test/resources/META-INF/spring.factories
View file @ b442d3b9
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
spring-boot-project/spring-boot/src/test/resources/application-withwebapplicationtype.yml
View file @ b442d3b9
spring.main.web-application-type: reactive
\ No newline at end of file
spring.main.web-application-type: reactive
spring-boot-project/spring-boot/src/test/resources/testnegatedprofiles.yml
View file @ b442d3b9
......@@ -17,4 +17,4 @@ spring:
profiles: "!other"
my:
property: fromnototherprofile
notother: foo
\ No newline at end of file
notother: foo
spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-double-link-single-java-opt.sh
View file @ b442d3b9
......@@ -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/
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment