From 073ac7bc9942a89c2af1eccbecebe266fa2ce395 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 26 Nov 2018 16:15:15 +0000 Subject: [PATCH] Fix Thymeleaf security dialect tests on Windows --- .../thymeleaf/ThymeleafReactiveAutoConfigurationTests.java | 3 ++- .../thymeleaf/ThymeleafServletAutoConfigurationTests.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) 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 0575b61015d..e737391bcc7 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 @@ -225,7 +225,8 @@ public class ThymeleafReactiveAutoConfigurationTests { new TestingAuthenticationToken("alice", "admin"))); IContext attrs = new SpringWebFluxContext(exchange); String result = engine.process("security-dialect", attrs); - assertThat(result).isEqualTo("
alice
\n"); + assertThat(result).isEqualTo( + "
alice
" + System.lineSeparator()); } @Test 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 92a1edc520d..df3963321fa 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 @@ -229,7 +229,8 @@ public class ThymeleafServletAutoConfigurationTests { SecurityContextHolder.setContext(new SecurityContextImpl( new TestingAuthenticationToken("alice", "admin"))); String result = engine.process("security-dialect", attrs); - assertThat(result).isEqualTo("
alice
\n"); + assertThat(result).isEqualTo("
alice
" + + System.lineSeparator()); } finally { SecurityContextHolder.clearContext();