Fix tests for Windows

Author: idodeclare

opengrok-indexer/src/main/java/org/opengrok/indexer/web/Util.java

@@ -842,10 +842,15 @@ public static String uid2url(String uid) {
         return url.substring(0, url.lastIndexOf(PATH_SEPARATOR)); // remove date from end
     }
 
+    /**
+     * Sanitizes Windows path delimiters (if {@link PlatformUtils#isWindows()}
+     * is {@code true}) as
+     * {@link org.opengrok.indexer.index.Indexer#PATH_SEPARATOR} in order not
+     * to conflict with the Lucene escape character and also so {@code path}
+     * appears as a correctly formed URI in search results.
+     */
     public static String fixPathIfWindows(String path) {
-        if (PlatformUtils.isWindows()) {
-            // Sanitize Windows path delimiters in order not to conflict with Lucene escape character
-            // and also so the path appears as correctly formed URI in the search results.
+        if (path != null && PlatformUtils.isWindows()) {
             return path.replace(File.separatorChar, PATH_SEPARATOR);
         }
         return path;

opengrok-indexer/src/test/java/org/opengrok/indexer/history/GitHistoryParserTest.java

@@ -19,7 +19,7 @@
 
 /*
  * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright (c) 2019, Chris Fraire <cfraire@me.com>.
+ * Portions Copyright (c) 2019-2020, Chris Fraire <cfraire@me.com>.
  */
 package org.opengrok.indexer.history;
 
@@ -41,6 +41,7 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.opengrok.indexer.util.TestRepository;
+import org.opengrok.indexer.web.Util;
 
 /**
  * @author austvik
@@ -114,7 +115,7 @@ public void shouldHandleMergeCommits() throws Exception {
 
         SortedSet<String> f0 = e0.getFiles();
         assertEquals("e[0] files size", 1, f0.size());
-        assertEquals("e[0] files[0]", "/contrib/serf/STATUS", f0.first());
+        assertEquals("e[0] files[0]", "/contrib/serf/STATUS", Util.fixPathIfWindows(f0.first()));
     }
 
     /**

opengrok-indexer/src/test/java/org/opengrok/indexer/history/GitRepositoryOctopusTest.java

@@ -19,7 +19,7 @@
 
 /*
  * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright (c) 2019, Chris Fraire <cfraire@me.com>.
+ * Portions Copyright (c) 2019-2020, Chris Fraire <cfraire@me.com>.
  */
 package org.opengrok.indexer.history;
 
@@ -35,11 +35,13 @@
 import org.opengrok.indexer.condition.ConditionalRunRule;
 import org.opengrok.indexer.condition.RepositoryInstalled;
 import org.opengrok.indexer.util.TestRepository;
+import org.opengrok.indexer.web.Util;
 
 import java.io.File;
 import java.util.List;
 import java.util.SortedSet;
 import java.util.TreeSet;
+import java.util.stream.Collectors;
 
 /**
  * @author austvik
@@ -178,20 +180,21 @@ public void testOctopusHistory() throws Exception {
 
         SortedSet<String> allFiles = new TreeSet<>();
         for (HistoryEntry entry : entries) {
-            allFiles.addAll(entry.getFiles());
+            allFiles.addAll(entry.getFiles().stream().map(Util::fixPathIfWindows).
+                    collect(Collectors.toList()));
         }
 
-        assertTrue("contains /git-octopus/d", allFiles.contains("/git-octopus/d"));
-        assertTrue("contains /git-octopus/c", allFiles.contains("/git-octopus/c"));
-        assertTrue("contains /git-octopus/b", allFiles.contains("/git-octopus/b"));
-        assertTrue("contains /git-octopus/a", allFiles.contains("/git-octopus/a"));
-        assertEquals("git-octopus four files from log", 4, allFiles.size());
+        assertTrue("should contain /git-octopus/d", allFiles.contains("/git-octopus/d"));
+        assertTrue("should contain /git-octopus/c", allFiles.contains("/git-octopus/c"));
+        assertTrue("should contain /git-octopus/b", allFiles.contains("/git-octopus/b"));
+        assertTrue("should contain /git-octopus/a", allFiles.contains("/git-octopus/a"));
+        assertEquals("git-octopus files from log", 4, allFiles.size());
 
         HistoryEntry first = entries.get(0);
         assertEquals("should be merge commit hash", "206f862b", first.getRevision());
         assertEquals("should be merge commit message",
                 "Merge branches 'file_a', 'file_b' and 'file_c' into master, and add d",
                 first.getMessage());
-        assertEquals("git-octopus four files for merge", 4, first.getFiles().size());
+        assertEquals("git-octopus files for merge", 4, first.getFiles().size());
     }
 }