Skip to content

Commit b442d3b

Browse files
committed
Merge branch '1.5.x' into 2.0.x
2 parents 5fba43a + 80d8a5c commit b442d3b

File tree

31 files changed

+44
-32
lines changed

31 files changed

+44
-32
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public void createFromConfigClass() {
7373
load(BaseConfiguration.class, "spring.thymeleaf.suffix:.html");
7474
TemplateEngine engine = this.context.getBean(TemplateEngine.class);
7575
Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar"));
76-
String result = engine.process("template", attrs);
76+
String result = engine.process("template", attrs).trim();
7777
assertThat(result).isEqualTo("<html>bar</html>");
7878
}
7979

@@ -176,7 +176,7 @@ public void useDataDialect() {
176176
ISpringWebFluxTemplateEngine engine = this.context
177177
.getBean(ISpringWebFluxTemplateEngine.class);
178178
Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar"));
179-
String result = engine.process("data-dialect", attrs);
179+
String result = engine.process("data-dialect", attrs).trim();
180180
assertThat(result).isEqualTo("<html><body data-foo=\"bar\"></body></html>");
181181
}
182182

@@ -186,7 +186,7 @@ public void useJava8TimeDialect() {
186186
ISpringWebFluxTemplateEngine engine = this.context
187187
.getBean(ISpringWebFluxTemplateEngine.class);
188188
Context attrs = new Context(Locale.UK);
189-
String result = engine.process("java8time-dialect", attrs);
189+
String result = engine.process("java8time-dialect", attrs).trim();
190190
assertThat(result).isEqualTo("<html><body>2015-11-24</body></html>");
191191
}
192192

@@ -196,7 +196,7 @@ public void renderTemplate() {
196196
ISpringWebFluxTemplateEngine engine = this.context
197197
.getBean(ISpringWebFluxTemplateEngine.class);
198198
Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar"));
199-
String result = engine.process("home", attrs);
199+
String result = engine.process("home", attrs).trim();
200200
assertThat(result).isEqualTo("<html><body>bar</body></html>");
201201
}
202202

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public void createFromConfigClass() {
8989
"spring.thymeleaf.suffix:");
9090
TemplateEngine engine = this.context.getBean(TemplateEngine.class);
9191
Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar"));
92-
String result = engine.process("template.html", attrs);
92+
String result = engine.process("template.html", attrs).trim();
9393
assertThat(result).isEqualTo("<html>bar</html>");
9494
}
9595

@@ -172,7 +172,7 @@ public void useDataDialect() {
172172
load(BaseConfiguration.class);
173173
TemplateEngine engine = this.context.getBean(TemplateEngine.class);
174174
Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar"));
175-
String result = engine.process("data-dialect", attrs);
175+
String result = engine.process("data-dialect", attrs).trim();
176176
assertThat(result).isEqualTo("<html><body data-foo=\"bar\"></body></html>");
177177
}
178178

@@ -181,7 +181,7 @@ public void useJava8TimeDialect() {
181181
load(BaseConfiguration.class);
182182
TemplateEngine engine = this.context.getBean(TemplateEngine.class);
183183
Context attrs = new Context(Locale.UK);
184-
String result = engine.process("java8time-dialect", attrs);
184+
String result = engine.process("java8time-dialect", attrs).trim();
185185
assertThat(result).isEqualTo("<html><body>2015-11-24</body></html>");
186186
}
187187

@@ -190,7 +190,7 @@ public void renderTemplate() {
190190
load(BaseConfiguration.class);
191191
TemplateEngine engine = this.context.getBean(TemplateEngine.class);
192192
Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar"));
193-
String result = engine.process("home", attrs);
193+
String result = engine.process("home", attrs).trim();
194194
assertThat(result).isEqualTo("<html><body>bar</body></html>");
195195
}
196196

spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/mappings/non-annotated.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
</basic>
1616
</attributes>
1717
</entity>
18-
</entity-mappings>
18+
</entity-mappings>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
INSERT INTO CITY (ID, NAME, STATE, COUNTRY, MAP) values (2000, 'Washington', 'DC', 'US', 'Google');
1+
INSERT INTO CITY (ID, NAME, STATE, COUNTRY, MAP) values (2000, 'Washington', 'DC', 'US', 'Google');

0 commit comments

Comments
 (0)