From a673310edc757afab065f36b30dda28a52513694 Mon Sep 17 00:00:00 2001 From: Janne Valkealahti Date: Sat, 28 May 2022 08:17:40 +0100 Subject: [PATCH] Fix tests for win --- .../shell/standard/commands/HelpTests.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/spring-shell-standard-commands/src/test/java/org/springframework/shell/standard/commands/HelpTests.java b/spring-shell-standard-commands/src/test/java/org/springframework/shell/standard/commands/HelpTests.java index b8a63569..e1f769fe 100644 --- a/spring-shell-standard-commands/src/test/java/org/springframework/shell/standard/commands/HelpTests.java +++ b/spring-shell-standard-commands/src/test/java/org/springframework/shell/standard/commands/HelpTests.java @@ -121,7 +121,8 @@ public class HelpTests { .and() .build(); commandCatalog.register(registration); - CharSequence help = this.help.help("first-command").toString(); + String help = this.help.help("first-command").toString(); + help = removeNewLines(help); assertThat(help).isEqualTo(sample()); } @@ -129,6 +130,7 @@ public class HelpTests { public void testCommandListDefault() throws Exception { registerCommandListCommands(); String list = this.help.help(null).toString(); + list = removeNewLines(list); assertThat(list).isEqualTo(sample()); } @@ -137,6 +139,7 @@ public class HelpTests { registerCommandListCommands(); this.help.setShowGroups(false); String list = this.help.help(null).toString(); + list = removeNewLines(list); assertThat(list).isEqualTo(sample()); } @@ -147,9 +150,13 @@ public class HelpTests { }).isInstanceOf(IllegalArgumentException.class); } + private String removeNewLines(String str) { + return str.replace("\r", "").replace("\n", ""); + } + private String sample() throws IOException { InputStream is = new ClassPathResource(HelpTests.class.getSimpleName() + "-" + testName + ".txt", HelpTests.class).getInputStream(); - return FileCopyUtils.copyToString(new InputStreamReader(is, "UTF-8")).replace("&", ""); + return removeNewLines(FileCopyUtils.copyToString(new InputStreamReader(is, "UTF-8"))); } private void registerCommandListCommands() throws Exception {