address test issues

Author: vladak

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

@@ -38,6 +38,7 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.net.URI;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -91,6 +92,7 @@ class FileHistoryCacheTest {
     private boolean savedFetchHistoryWhenNotInCache;
     private boolean savedIsHandleHistoryOfRenamedFiles;
     private boolean savedIsTagsEnabled;
+    private boolean savedIsIndexer;
 
     @BeforeAll
     static void setUpClass() throws Exception {
@@ -117,6 +119,9 @@ void setUp() throws Exception {
         savedFetchHistoryWhenNotInCache = env.isFetchHistoryWhenNotInCache();
         savedIsHandleHistoryOfRenamedFiles = env.isHandleHistoryOfRenamedFiles();
         savedIsTagsEnabled = env.isTagsEnabled();
+        savedIsIndexer = env.isIndexer();
+
+        env.setIndexer(true);
     }
 
     /**
@@ -134,6 +139,7 @@ void tearDown() {
         env.setIncludedNames(new Filter());
         env.setHandleHistoryOfRenamedFiles(savedIsHandleHistoryOfRenamedFiles);
         env.setTagsEnabled(savedIsTagsEnabled);
+        env.setIndexer(savedIsIndexer);
     }
 
     /**
@@ -254,12 +260,13 @@ void testStoreAndGetIncrementalTags() throws Exception {
         File reposRoot = new File(repositories.getSourceRoot(), "mercurial");
         assertTrue(reposRoot.exists());
 
+        env.setTagsEnabled(true);
+
+        // It is necessary to call getRepository() only after tags were enabled
+        // to produce list of tags.
         Repository repo = RepositoryFactory.getRepository(reposRoot);
         assertNotNull(repo);
 
-        // Enable tagging of history entries.
-        repo.setTagsEnabled(true);
-
         History historyToStore = repo.getHistory(reposRoot);
         assertNotNull(historyToStore);
 
@@ -434,19 +441,22 @@ void testRenameFileThenDoIncrementalReindex() throws Exception {
         // The test expects support for renamed files.
         env.setHandleHistoryOfRenamedFiles(true);
 
+        // Use tags for better coverage.
+        env.setTagsEnabled(true);
+
+        // It is necessary to call getRepository() only after tags were enabled
+        // to produce list of tags.
         Repository repo = RepositoryFactory.getRepository(reposRoot);
         assertNotNull(repo);
 
-        // Use tags for better coverage.
-        repo.setTagsEnabled(true);
-
         // Generate history index.
         History historyToStore = repo.getHistory(reposRoot);
         cache.store(historyToStore, repo);
 
         // Import changesets which rename one of the files in the repository.
-        MercurialRepositoryTest.runHgCommand(reposRoot, "import",
-            Paths.get(getClass().getResource("/history/hg-export-renamed.txt").toURI()).toString());
+        URL url = getClass().getResource("/history/hg-export-renamed.txt");
+        assertNotNull(url);
+        MercurialRepositoryTest.runHgCommand(reposRoot, "import", Paths.get(url.toURI()).toString());
 
         // Perform incremental reindex.
         repo.createCache(cache, cache.getLatestCachedRevision(repo));
@@ -548,42 +558,46 @@ void testRenameFileThenDoIncrementalReindex() throws Exception {
     void testRenamedFilePlusChangesBranched() throws Exception {
         File reposRoot = new File(repositories.getSourceRoot(), "mercurial");
         assertTrue(reposRoot.exists());
-        History updatedHistory;
 
         // Branch the repo and add one changeset.
-        runHgCommand(reposRoot, "unbundle",
-            Paths.get(getClass().getResource("/history/hg-branch.bundle").toURI()).toString());
+        URL url = getClass().getResource("/history/hg-branch.bundle");
+        assertNotNull(url);
+        runHgCommand(reposRoot, "unbundle", Paths.get(url.toURI()).toString());
 
         // Import changesets which rename one of the files in the default branch.
-        runHgCommand(reposRoot, "import",
-            Paths.get(getClass().getResource("/history/hg-export-renamed.txt").toURI()).toString());
+        url = getClass().getResource("/history/hg-export-renamed.txt");
+        assertNotNull(url);
+        runHgCommand(reposRoot, "import", Paths.get(url.toURI()).toString());
 
         // Switch to the newly created branch.
         runHgCommand(reposRoot, "update", "mybranch");
 
+        // Use tags for better coverage.
+        env.setTagsEnabled(true);
+
+        // It is necessary to call getRepository() only after tags were enabled
+        // to produce list of tags.
         Repository repo = RepositoryFactory.getRepository(reposRoot);
         assertNotNull(repo);
 
         // The test expects support for renamed files.
         repo.setHandleRenamedFiles(true);
 
-        // Use tags for better coverage.
-        repo.setTagsEnabled(true);
-
         // Generate history index.
         History historyToStore = repo.getHistory(reposRoot);
         cache.store(historyToStore, repo);
 
         // Import changesets which rename the file in the new branch.
-        runHgCommand(reposRoot, "import",
-            Paths.get(getClass().getResource("/history/hg-export-renamed-branched.txt").toURI()).toString());
+        url = getClass().getResource("/history/hg-export-renamed-branched.txt");
+        assertNotNull(url);
+        runHgCommand(reposRoot, "import", Paths.get(url.toURI()).toString());
 
         // Perform incremental reindex.
         repo.createCache(cache, cache.getLatestCachedRevision(repo));
 
         // Check complete list of history entries for the renamed file.
         File testFile = new File(reposRoot.toString() + File.separatorChar + "blog.txt");
-        updatedHistory = cache.get(testFile, repo, false);
+        History updatedHistory = cache.get(testFile, repo, false);
 
         HistoryEntry e0 = new HistoryEntry(
                 "15:709c7a27f9fa",
@@ -978,7 +992,6 @@ void testNoHistoryFetch() throws Exception {
         env.setFetchHistoryWhenNotInCache(false);
 
         // Pretend we are done with first phase of indexing.
-        env.setIndexer(true);
         HistoryGuru.getInstance().setHistoryIndexDone();
 
         // First try repo with ability to fetch history for directories.