normalize newlines (#2308)

Author: Vladimir Kotal

opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/haskell/HaskellXrefTest.java

@@ -122,8 +122,8 @@ public void sampleTest() throws IOException {
             expectedOutputSteam.close();
         }
 
-        String actual[] = new String(sampleOutputStream.toByteArray(), "UTF-8").split("\n");
-        String expected[] = new String(expectedOutputSteam.toByteArray(), "UTF-8").split("\n");
+        String actual[] = new String(sampleOutputStream.toByteArray(), "UTF-8").split("\\r?\\n");
+        String expected[] = new String(expectedOutputSteam.toByteArray(), "UTF-8").split("\\r?\\n");
         assertLinesEqual("Haskell sampleTest()", expected, actual);
         assertEquals("Haskell LOC", 3, actLOC);
     }
@@ -161,7 +161,7 @@ private void writeAndCompare(String sourceResource, String resultResource,
         baos.close();
 
         String ostr = new String(baos.toByteArray(), "UTF-8");
-        String gotten[] = ostr.split("\n");
+        String gotten[] = ostr.split("\\r?\\n");
 
         String estr = new String(expbytes, "UTF-8");
         String expected[] = estr.split("\n");

opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/php/PhpXrefTest.java

@@ -136,7 +136,7 @@ public void sampleTest() throws IOException {
                 "analysis/php/sampleXrefRes.html");
         byte[] expbytes = copyStream(exp);
 
-        String gotten[] = new String(baos.toByteArray(), "UTF-8").split("\n");
+        String gotten[] = new String(baos.toByteArray(), "UTF-8").split("\\r?\\n");
         String expected[] = new String(expbytes, "UTF-8").split("\n");
         assertLinesEqual("PHP xref", expected, gotten);
         assertEquals("PHP LOC", 29, actLOC);