Skip to content

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

Fix (again) ResourceBannerTests failures on Windows 

Fixes gh-2096
parent f1cf6616
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
spring-boot/src/test/java/org/springframework/boot/ResourceBannerTests.java
View file @ 78241ff0
...@@ -43,7 +43,7 @@ public class ResourceBannerTests { ...@@ -43,7 +43,7 @@ public class ResourceBannerTests {
Resource resource = new ByteArrayResource( Resource resource = new ByteArrayResource(
"banner ${a} ${spring-boot.version} ${application.version}".getBytes()); "banner ${a} ${spring-boot.version} ${application.version}".getBytes());
String banner = printBanner(resource, "10.2", "2.0"); String banner = printBanner(resource, "10.2", "2.0");
assertThat(banner, startsWith("banner 1 10.2 2.0\n")); assertThat(banner, startsWith("banner 1 10.2 2.0"));
} }
@Test @Test
...@@ -51,7 +51,7 @@ public class ResourceBannerTests { ...@@ -51,7 +51,7 @@ public class ResourceBannerTests {
Resource resource = new ByteArrayResource( Resource resource = new ByteArrayResource(
"banner ${a} ${spring-boot.version} ${application.version}".getBytes()); "banner ${a} ${spring-boot.version} ${application.version}".getBytes());
String banner = printBanner(resource, null, null); String banner = printBanner(resource, null, null);
assertThat(banner, startsWith("banner 1 \n")); assertThat(banner, startsWith("banner 1 "));
} }
@Test @Test
...@@ -60,7 +60,7 @@ public class ResourceBannerTests { ...@@ -60,7 +60,7 @@ public class ResourceBannerTests {
"banner ${a}${spring-boot.formatted-version}${application.formatted-version}" "banner ${a}${spring-boot.formatted-version}${application.formatted-version}"
.getBytes()); .getBytes());
String banner = printBanner(resource, "10.2", "2.0"); String banner = printBanner(resource, "10.2", "2.0");
assertThat(banner, startsWith("banner 1 (v10.2) (v2.0)\n")); assertThat(banner, startsWith("banner 1 (v10.2) (v2.0)"));
} }
@Test @Test
...@@ -69,7 +69,7 @@ public class ResourceBannerTests { ...@@ -69,7 +69,7 @@ public class ResourceBannerTests {
"banner ${a}${spring-boot.formatted-version}${application.formatted-version}" "banner ${a}${spring-boot.formatted-version}${application.formatted-version}"
.getBytes()); .getBytes());
String banner = printBanner(resource, null, null); String banner = printBanner(resource, null, null);
assertThat(banner, startsWith("banner 1\n")); assertThat(banner, startsWith("banner 1"));
} }
private String printBanner(Resource resource, String bootVersion, private String printBanner(Resource resource, String bootVersion,
......
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