Fix tests for win

Author: jvalkeal

spring-shell-standard-commands/src/test/java/org/springframework/shell/standard/commands/HelpTests.java

@@ -121,14 +121,16 @@ public void testCommandHelp() throws Exception {
 				.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());
 	}
 
 	@Test
 	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 void testCommandListFlat() throws Exception {
 		registerCommandListCommands();
 		this.help.setShowGroups(false);
 		String list = this.help.help(null).toString();
+		list = removeNewLines(list);
 		assertThat(list).isEqualTo(sample());
 	}
 
@@ -147,9 +150,13 @@ public void testUnknownCommand() throws Exception {
 		}).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 {