Merge pull request #792 from jstourac/accessLogTestsFix

[UNDERTOW-1574] Failing access log tests due to different new-line ch…
undertow-io · Jul 29, 2019 · 8b2bb8b · 8b2bb8b
2 parents 0b97ab2 + 9c570a7
commit 8b2bb8b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/core/src/test/java/io/undertow/server/handlers/accesslog/AccessLogFileTestCase.java b/core/src/test/java/io/undertow/server/handlers/accesslog/AccessLogFileTestCase.java
@@ -109,7 +109,7 @@ private void verifySingleLogMessageToFile(Path logFileName, DefaultAccessLogRece
             Assert.assertEquals("Hello", HttpClientUtils.readResponse(result));
             latchHandler.await();
             logReceiver.awaitWrittenForTest();
-            Assert.assertEquals("Remote address " + DefaultServer.getDefaultServerAddress().getAddress().getHostAddress() + " Code 200 test-header single-val - [d, d]\n", new String(Files.readAllBytes(logFileName)));
+            Assert.assertEquals("Remote address " + DefaultServer.getDefaultServerAddress().getAddress().getHostAddress() + " Code 200 test-header single-val - [d, d]" + System.lineSeparator(), new String(Files.readAllBytes(logFileName)));
         } finally {
             client.getConnectionManager().shutdown();
         }
@@ -188,12 +188,12 @@ public void testForcedLogRotation() throws IOException, InterruptedException {
             latchHandler.await();
             latchHandler.reset();
             logReceiver.awaitWrittenForTest();
-            Assert.assertEquals("Remote address " + DefaultServer.getDefaultServerAddress().getAddress().getHostAddress() + " Code 200 test-header v1\n", new String(Files.readAllBytes(logFileName)));
+            Assert.assertEquals("Remote address " + DefaultServer.getDefaultServerAddress().getAddress().getHostAddress() + " Code 200 test-header v1" + System.lineSeparator(), new String(Files.readAllBytes(logFileName)));
             logReceiver.rotate();
             logReceiver.awaitWrittenForTest();
             Assert.assertFalse(Files.exists(logFileName));
             Path firstLogRotate = logDirectory.resolve("server." + new SimpleDateFormat("yyyy-MM-dd").format(new Date()) + ".log");
-            Assert.assertEquals("Remote address " + DefaultServer.getDefaultServerAddress().getAddress().getHostAddress() + " Code 200 test-header v1\n", new String(Files.readAllBytes(firstLogRotate)));
+            Assert.assertEquals("Remote address " + DefaultServer.getDefaultServerAddress().getAddress().getHostAddress() + " Code 200 test-header v1" + System.lineSeparator(), new String(Files.readAllBytes(firstLogRotate)));
 
             get = new HttpGet(DefaultServer.getDefaultServerURL() + "/path");
             get.addHeader("test-header", "v2");
@@ -203,12 +203,12 @@ public void testForcedLogRotation() throws IOException, InterruptedException {
             latchHandler.await();
             latchHandler.reset();
             logReceiver.awaitWrittenForTest();
-            Assert.assertEquals("Remote address " + DefaultServer.getDefaultServerAddress().getAddress().getHostAddress() + " Code 200 test-header v2\n", new String(Files.readAllBytes(logFileName)));
+            Assert.assertEquals("Remote address " + DefaultServer.getDefaultServerAddress().getAddress().getHostAddress() + " Code 200 test-header v2" + System.lineSeparator(), new String(Files.readAllBytes(logFileName)));
             logReceiver.rotate();
             logReceiver.awaitWrittenForTest();
             Assert.assertFalse(Files.exists(logFileName));
             Path secondLogRotate = logDirectory.resolve("server." + new SimpleDateFormat("yyyy-MM-dd").format(new Date()) + "-1.log");
-            Assert.assertEquals("Remote address " + DefaultServer.getDefaultServerAddress().getAddress().getHostAddress() + " Code 200 test-header v2\n", new String(Files.readAllBytes(secondLogRotate)));
+            Assert.assertEquals("Remote address " + DefaultServer.getDefaultServerAddress().getAddress().getHostAddress() + " Code 200 test-header v2" + System.lineSeparator(), new String(Files.readAllBytes(secondLogRotate)));
 
         } finally {
             client.getConnectionManager().shutdown();

diff --git a/core/src/test/java/io/undertow/server/handlers/accesslog/ExtendedAccessLogFileTestCase.java b/core/src/test/java/io/undertow/server/handlers/accesslog/ExtendedAccessLogFileTestCase.java
@@ -102,7 +102,7 @@ private void verifySingleLogMessageToFile(Path logFileName, DefaultAccessLogRece
             latchHandler.await();
             logReceiver.awaitWrittenForTest();
             String data = new String(Files.readAllBytes(logFileName));
-            String[] lines = data.split("\n");
+            String[] lines = data.split(System.lineSeparator());
             Assert.assertEquals("#Fields: " + PATTERN, lines[0]);
             Assert.assertEquals("#Version: 2.0", lines[1]);
             Assert.assertEquals("#Software: " + Version.getFullVersionString(), lines[2]);