Merge branch 'master' into loop-opengrok

Author: lupuleasa-core

opengrok-indexer/src/main/java/org/opengrok/indexer/configuration/RuntimeEnvironment.java

@@ -612,15 +612,16 @@ public boolean validateUniversalCtags() {
             executor.exec(false);
             String output = executor.getOutputString();
             boolean isUnivCtags = output != null && output.contains("Universal Ctags");
-            if (output == null && !isUnivCtags) {
-                LOGGER.log(Level.SEVERE, "Error: No Universal Ctags found in PATH !\n"
+            if (output == null || !isUnivCtags) {
+                LOGGER.log(Level.SEVERE, "Error: No Universal Ctags found !\n"
                         + "(tried running " + "{0}" + ")\n"
                         + "Please use the -c option to specify path to a "
                         + "Universal Ctags program.\n"
-                        + "Or set it in Java system property "
-                        + SYSTEM_CTAGS_PROPERTY, getCtags());
+                        + "Or set it in Java system property {1}",
+                        new Object[]{getCtags(), SYSTEM_CTAGS_PROPERTY});
                 ctagsFound = false;
             } else {
+                LOGGER.log(Level.INFO, "Using ctags: {0}", output.trim());
                 ctagsFound = true;
             }
         }

opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexDatabase.java

@@ -1077,7 +1077,7 @@ private void indexDown(File dir, String parent, IndexDownArgs args)
         Arrays.sort(files, FILENAME_COMPARATOR);
 
         for (File file : files) {
-            String path = parent + '/' + file.getName();
+            String path = parent + File.separator + file.getName();
             if (!accept(dir, file, outLocalRelPath)) {
                 if (outLocalRelPath[0] != null) {
                     File xrefPath = new File(xrefDir, path);

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);

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

@@ -290,16 +290,16 @@ public void parseALaLK() throws Exception {
         assertEquals(author1, e0.getAuthor());
         assertEquals(new SimpleDateFormat(gitISODatePattern).parse(date1), e0.getDate());
         assertEquals(1, e0.getFiles().size());
-        assertEquals(File.separator + filename1, e0.getFiles().first());
+        assertEquals(File.separator + filename1.replace('/', File.separatorChar), e0.getFiles().first());
         assertTrue(e0.getMessage().contains("subject title"));
         assertTrue(e0.getMessage().contains("Signed-off-by"));
         HistoryEntry e1 = result.getHistoryEntries().get(1);
         assertEquals(commitId2, e1.getRevision());
         assertEquals(author2, e1.getAuthor());
         assertEquals(new SimpleDateFormat(gitISODatePattern).parse(date1), e1.getDate());
         assertEquals(2, e1.getFiles().size());
-        assertEquals(File.separator + filename1, e1.getFiles().first());
-        assertEquals(File.separator + filename2, e1.getFiles().last());
+        assertEquals(File.separator + filename1.replace('/', File.separatorChar), e1.getFiles().first());
+        assertEquals(File.separator + filename2.replace('/', File.separatorChar), e1.getFiles().last());
         assertTrue(e1.getMessage().contains("[PATCH]"));
         assertTrue(e1.getMessage().contains("Signed-off-by"));
     }

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

@@ -29,6 +29,7 @@
 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 org.junit.After;
@@ -255,8 +256,8 @@ public void testGetHistoryForOnceRenamed() throws Exception {
                 + "\treturn 0;\n"
                 + "}\n";
 
-        runRenamedTest("moved2/renamed2.c", "84599b3", exp_str);
-        runRenamedTest("moved/renamed2.c", "67dfbe2", exp_str);
+        runRenamedTest(Paths.get("moved2", "renamed2.c").toString(), "84599b3", exp_str);
+        runRenamedTest(Paths.get("moved", "renamed2.c").toString(), "67dfbe2", exp_str);
     }
 
     /**
@@ -294,8 +295,8 @@ public void testGetHistoryForTwiceRenamed() throws Exception {
                 + "\treturn 0;\n"
                 + "}\n";
 
-        runRenamedTest("moved/renamed.c", "1086eaf", exp_str);
-        runRenamedTest("moved/renamed2.c", "67dfbe2", exp_str);
+        runRenamedTest(Paths.get("moved", "renamed.c").toString(), "1086eaf", exp_str);
+        runRenamedTest(Paths.get("moved", "renamed2.c").toString(), "67dfbe2", exp_str);
     }
 
     /**
@@ -321,7 +322,7 @@ public void testGetHistoryForThreeTimesRenamed() throws Exception {
                 + "\treturn 0;\n"
                 + "}\n";
 
-        runRenamedTest("moved/renamed.c", "b641394", exp_str);
+        runRenamedTest(Paths.get("moved", "renamed.c").toString(), "b641394", exp_str);
         runRenamedTest("renamed.c", "ce4c98e", exp_str);
     }
 
@@ -333,7 +334,7 @@ public void testGetHistoryForThreeTimesRenamed() throws Exception {
      */
     @Test
     public void testGetHistoryForNonExistentRenamed() throws Exception {
-        runRenamedTest("moved/renamed.c", "67dfbe2", null);
+        runRenamedTest(Paths.get("moved", "renamed.c").toString(), "67dfbe2", null);
         runRenamedTest("renamed.c", "67dfbe2", null);
     }
 

opengrok-indexer/src/test/java/org/opengrok/indexer/util/PathUtilsTest.java

@@ -25,6 +25,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -63,16 +64,16 @@ public void tearDown() {
 
     @Test
     public void shouldHandleSameInputs() throws IOException {
-        final String USR_BIN = "/usr/bin";
+        final String USR_BIN = Paths.get("/usr/bin").toString();
         String rel = PathUtils.getRelativeToCanonical(USR_BIN, USR_BIN);
-        Assert.assertEquals("/usr/bin rel to itself", "", rel);
+        Assert.assertEquals(USR_BIN + " rel to itself", "", rel);
     }
 
     @Test
     public void shouldHandleEffectivelySameInputs() throws IOException {
-        final String USR_BIN = "/usr/bin";
-        String rel = PathUtils.getRelativeToCanonical(USR_BIN + "/", USR_BIN);
-        Assert.assertEquals("/usr/bin rel to ~itself", "", rel);
+        final String USR_BIN = Paths.get("/usr/bin").toString();
+        String rel = PathUtils.getRelativeToCanonical(USR_BIN + File.separator, USR_BIN);
+        Assert.assertEquals(USR_BIN + " rel to ~itself", "", rel);
     }
 
     @Test

tools/src/main/python/indexer.py

@@ -90,7 +90,7 @@ def FindCtags(logger):
     """
     binary = None
     logger.debug("Trying to find ctags binary")
-    for program in ['ctags-exuberant', 'exctags', 'ctags']:
+    for program in ['universal-ctags', 'ctags']:
         executable = get_command(logger, None, program)
         if executable:
             # Verify that this executable is or is based on Exuberant Ctags