Avoid duplication of normalization logic in jnlp unit test

Signed-off-by: Mitch Gaffigan <mitch.gaffigan@comcast.net>

Author: mgaffigan

server/test/com/mirth/connect/server/servlets/WebStartServletTest.java

@@ -54,10 +54,7 @@ public void testDoGetCore() throws Exception {
 
 		webStartServlet.doGet(request, response);
 
-		assertEquals(
-				CORE_JNLP.trim().replaceAll("\\s+", ""),
-				response.getResponseString().trim().replaceAll("\\s+", "")
-		);
+		assertEquals(normalizeWhitespace(CORE_JNLP), normalizeWhitespace(response.getResponseString()));
 		assertEquals("application/x-java-jnlp-file", response.getContentType());
 		assertEquals("no-cache", response.getHeader("Pragma"));
 		assertEquals("nosniff", response.getHeader("X-Content-Type-Options"));
@@ -73,10 +70,7 @@ public void testDoGetCore() throws Exception {
 
 		webStartServlet.doGet(request, response);
 
-		assertEquals(
-				CORE_JNLP.trim().replaceAll("\\s+", ""),
-				response.getResponseString().trim().replaceAll("\\s+", "")
-		);
+		assertEquals(normalizeWhitespace(CORE_JNLP), normalizeWhitespace(response.getResponseString()));
 		assertEquals("application/x-java-jnlp-file", response.getContentType());
 		assertEquals("no-cache", response.getHeader("Pragma"));
 		assertEquals("nosniff", response.getHeader("X-Content-Type-Options"));
@@ -106,10 +100,7 @@ public String answer(InvocationOnMock invocation) throws Throwable {
 
 		webStartServlet.doGet(request, response);
 
-		assertEquals(
-				CORE_JNLP.trim().replaceAll("\\s+", ""),
-				response.getResponseString().trim().replaceAll("\\s+", "")
-		);
+		assertEquals(normalizeWhitespace(CORE_JNLP), normalizeWhitespace(response.getResponseString()));
 		assertEquals("application/x-java-jnlp-file", response.getContentType());
 		assertEquals("attachment; filename = \"webstart.jnlp\"", response.getHeader("Content-Disposition"));
 	}
@@ -225,10 +216,7 @@ public void testDoGetExtension() throws Exception {
 
 		webStartServlet.doGet(request, response);
 
-		assertEquals(
-				EXTENSION_JNLP.trim().replaceAll("\\s+", ""),
-				response.getResponseString().trim().replaceAll("\\s+", "")
-		);
+		assertEquals(normalizeWhitespace(EXTENSION_JNLP), normalizeWhitespace(response.getResponseString()));
 		assertEquals("application/x-java-jnlp-file", response.getContentType());
 		assertEquals("no-cache", response.getHeader("Pragma"));
 		assertEquals("nosniff", response.getHeader("X-Content-Type-Options"));
@@ -245,10 +233,7 @@ public void testDoGetExtension() throws Exception {
 
 		webStartServlet.doGet(request, response);
 
-		assertEquals(
-				EXTENSION_JNLP.trim().replaceAll("\\s+", ""),
-				response.getResponseString().trim().replaceAll("\\s+", "")
-		);
+		assertEquals(normalizeWhitespace(EXTENSION_JNLP), normalizeWhitespace(response.getResponseString()));
 		assertEquals("application/x-java-jnlp-file", response.getContentType());
 		assertEquals("no-cache", response.getHeader("Pragma"));
 		assertEquals("nosniff", response.getHeader("X-Content-Type-Options"));
@@ -551,6 +536,12 @@ private static DocumentBuilderFactory getSecureDocumentBuilderFactory() throws E
 		return dbf;
 	}
 
+	private static String normalizeWhitespace(String input) {
+		// normalize whitespace (including new lines) to a single space
+		// (the round-trip munges newlines depending on OS and on the phase of the moon)
+		return input.trim().replaceAll("[\\s\\r\\n ]+", " ");
+	}
+
 	private static String CORE_JNLP = "<jnlp codebase=\"https://localhost:8443\" version=\"4.5.2\">\n"
 			+ "	<information>\n" + "		<title>Mirth Connect Administrator 4.5.2</title>\n"
 			+ "		<vendor>NextGen Healthcare</vendor>\n" + "		<homepage href=\"http://www.nextgen.com\"/>\n"