fixing git repository tests - path issue

Author: tulinkry

opengrok-indexer/src/main/java/org/opengrok/indexer/history/GitRepository.java

@@ -31,6 +31,7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.nio.file.Paths;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -179,14 +180,19 @@ private InputStream getHistoryRev(String fullpath, String rev) {
         File directory = new File(getDirectoryName());
 
         try {
-            String filename = fullpath.substring(getDirectoryName().length() + 1);
+            /*
+             * Be careful, git uses only forward slashes in its command and output (not in file path).
+             * Using backslashes together with git show will get empty output and 0 status code.
+             */
+            String filename = fullpath.substring(getDirectoryName().length() + 1)
+                                      .replace(File.separatorChar, '/');
             ensureCommand(CMD_PROPERTY_KEY, CMD_FALLBACK);
             String argv[] = {
                 RepoCommand,
                 "show",
                 rev + ":" + filename
             };
-            
+
             Executor executor = new Executor(Arrays.asList(argv), directory,
                     RuntimeEnvironment.getInstance().getInteractiveCommandTimeout());
             int status = executor.exec();
@@ -236,6 +242,7 @@ public String get() {
         }
 
         InputStream ret = getHistoryRev(fullpath, rev);
+
         if (ret == null) {
             /*
              * If we failed to get the contents it might be that the file was
@@ -303,6 +310,7 @@ protected String findOriginalName(String fullpath, String changeset)
         }
 
         String fileInRepo = getPathRelativeToRepositoryRoot(fullpath);
+
         /*
          * Get the list of file renames for given file to the specified
          * revision.
@@ -345,7 +353,8 @@ protected String findOriginalName(String fullpath, String changeset)
                 }
 
                 if ((m = pattern.matcher(line)).find()) {
-                    originalFile = m.group(1);
+                    // git output paths with forward slashes so transform it if needed
+                    originalFile = Paths.get(m.group(1)).toString();
                 }
             }
         }
@@ -362,7 +371,7 @@ protected String findOriginalName(String fullpath, String changeset)
 
     /**
      * Get first revision of given file without following renames.
-     * @param file file to get first revision of
+     * @param fullpath file path to get first revision of
      */
     private String getFirstRevision(String fullpath) throws IOException {
         String[] argv = {

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

@@ -23,19 +23,20 @@
  */
 package org.opengrok.indexer.history;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.Reader;
-import java.io.StringReader;
 import java.nio.file.Paths;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
-
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -46,10 +47,8 @@
 import org.opengrok.indexer.condition.ConditionalRun;
 import org.opengrok.indexer.condition.ConditionalRunRule;
 import org.opengrok.indexer.condition.RepositoryInstalled;
-import org.opengrok.indexer.util.TestRepository;
-
-import static org.junit.Assert.*;
 import org.opengrok.indexer.configuration.RuntimeEnvironment;
+import org.opengrok.indexer.util.TestRepository;
 
 /**
  *
@@ -178,13 +177,13 @@ public void testDateFormats() {
     @Test
     public void testRenamedFiles() throws Exception {
         String[][] tests = new String[][]{
-            {"moved2/renamed2.c", "84599b3c", "moved2/renamed2.c"},
-            {"moved2/renamed2.c", "67dfbe26", "moved/renamed2.c"},
-            {"moved2/renamed2.c", "67dfbe26", "moved/renamed2.c"},
-            {"moved2/renamed2.c", "1086eaf5", "moved/renamed.c"},
-            {"moved2/renamed2.c", "b6413947", "moved/renamed.c"},
-            {"moved2/renamed2.c", "ce4c98ec", "renamed.c"},
-            {"moved2/renamed2.c", "bb74b7e8", "renamed.c"}
+                {Paths.get("moved2", "renamed2.c").toString(), "84599b3c", Paths.get("moved2", "renamed2.c").toString()},
+                {Paths.get("moved2", "renamed2.c").toString(), "67dfbe26", Paths.get("moved", "renamed2.c").toString()},
+                {Paths.get("moved2", "renamed2.c").toString(), "67dfbe26", Paths.get("moved", "renamed2.c").toString()},
+                {Paths.get("moved2", "renamed2.c").toString(), "1086eaf5", Paths.get("moved", "renamed.c").toString()},
+                {Paths.get("moved2", "renamed2.c").toString(), "b6413947", Paths.get("moved", "renamed.c").toString()},
+                {Paths.get("moved2", "renamed2.c").toString(), "ce4c98ec", "renamed.c"},
+                {Paths.get("moved2", "renamed2.c").toString(), "bb74b7e8", "renamed.c"}
         };
 
         File root = new File(repository.getSourceRoot(), "git");
@@ -312,8 +311,8 @@ public void testGetHistoryForOnceRenamed() throws Exception {
                 + "\treturn 0;\n"
                 + "}\n";
 
-        runRenamedTest(Paths.get("moved2", "renamed2.c").toString(), "84599b3", exp_str);
-        runRenamedTest(Paths.get("moved", "renamed2.c").toString(), "67dfbe2", exp_str);
+        runRenamedTest("moved2/renamed2.c", "84599b3", exp_str);
+        runRenamedTest("moved/renamed2.c", "67dfbe2", exp_str);
     }
 
     /**
@@ -379,7 +378,7 @@ public void testGetHistoryForThreeTimesRenamed() throws Exception {
                 + "}\n";
 
         runRenamedTest(Paths.get("moved", "renamed.c").toString(), "b641394", exp_str);
-        runRenamedTest("renamed.c", "ce4c98e", exp_str);
+        runRenamedTest(Paths.get("renamed.c").toString(), "ce4c98e", exp_str);
     }
 
     /**
@@ -391,7 +390,7 @@ public void testGetHistoryForThreeTimesRenamed() throws Exception {
     @Test
     public void testGetHistoryForNonExistentRenamed() throws Exception {
         runRenamedTest(Paths.get("moved", "renamed.c").toString(), "67dfbe2", null);
-        runRenamedTest("renamed.c", "67dfbe2", null);
+        runRenamedTest(Paths.get("renamed.c").toString(), "67dfbe2", null);
     }
 
     private void runRenamedTest(String fname, String cset, String content) throws Exception {