Merge pull request #1673 from vladak/ctags_indexerrepotest

use ctags binary from RuntimeEnvironment in IndexerRepoTest.java

Author: tarzanek

test/org/opensolaris/opengrok/index/IndexerRepoTest.java

@@ -46,16 +46,6 @@ public class IndexerRepoTest {
     TestRepository repository;
     private final String ctagsProperty = "org.opensolaris.opengrok.analysis.Ctags";
 
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-        assertTrue("No point in running indexer tests without valid ctags",
-                RuntimeEnvironment.getInstance().validateExuberantCtags());
-    }
-
-    @AfterClass
-    public static void tearDownClass() throws Exception {
-    }
-
     @Before
     public void setUp() throws IOException {
         repository = new TestRepository();
@@ -79,7 +69,7 @@ private void checkNumberOfThreads() {
         Thread[] threads = new Thread[mainGroup.activeCount()];
         mainGroup.enumerate(threads);
         for (int i = 0; i < threads.length; i++) {
-            if (threads[i].getName() == null) {
+            if (threads[i] == null || threads[i].getName() == null) {
                 continue;
             }
             assertEquals(false, threads[i].getName().contains("renamed-handling"));
@@ -93,11 +83,11 @@ public void testMainWithH() throws IOException {
         env.setCtags(System.getProperty(ctagsProperty, "ctags"));
         if (env.validateExuberantCtags()) {
             String[] argv = {"-S", "-H", "-s", repository.getSourceRoot(),
-                "-d", repository.getDataRoot(), "-v"};
+                "-d", repository.getDataRoot(), "-v", "-c", env.getCtags()};
             Indexer.main(argv);
             checkNumberOfThreads();
         } else {
-            System.out.println("Skipping test. Could not find a ctags I could use in path.");
+            System.out.println("Skipping test. Could not find a ctags I could use.");
         }
     }
 
@@ -108,11 +98,11 @@ public void testMainWithoutH() throws IOException {
         env.setCtags(System.getProperty(ctagsProperty, "ctags"));
         if (env.validateExuberantCtags()) {
             String[] argv = {"-S", "-P", "-s", repository.getSourceRoot(),
-                "-d", repository.getDataRoot(), "-v"};
+                "-d", repository.getDataRoot(), "-v", "-c", env.getCtags()};
             Indexer.main(argv);
             checkNumberOfThreads();
         } else {
-            System.out.println("Skipping test. Could not find a ctags I could use in path.");
+            System.out.println("Skipping test. Could not find a ctags I could use.");
         }
     }
 }