finish history test

Author: Vladimir Kotal

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

@@ -696,15 +696,12 @@ private void getFiles(org.eclipse.jgit.lib.Repository repository,
                     prepareTreeParser(repository, newCommit));
 
             for (DiffEntry diff : diffs) {
-                if (diff.getChangeType() == DiffEntry.ChangeType.RENAME) {  // TODO: add COPY ?
-                    if (isHandleRenamedFiles()) {
-                        renamedFiles.add(diff.getNewPath());
-                    } else {
-                        files.add(getDirectoryNameRelative() + "/" + diff.getNewPath());
-                    }
-                } else if (diff.getChangeType() != DiffEntry.ChangeType.DELETE) {
+                if (diff.getChangeType() != DiffEntry.ChangeType.DELETE) {
                     files.add(getDirectoryNameRelative() + "/" + diff.getNewPath());
                 }
+                if (diff.getChangeType() == DiffEntry.ChangeType.RENAME && isHandleRenamedFiles()) {  // TODO: add COPY ?
+                    renamedFiles.add(diff.getNewPath());
+                }
             }
         }
     }

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

@@ -515,11 +515,6 @@ public void testHistory(boolean renamedHandling) throws Exception {
         File root = new File(repository.getSourceRoot(), "git");
         GitRepository gitrepo = (GitRepository) RepositoryFactory.getRepository(root);
 
-        History history = gitrepo.getHistory(root);
-        assertNotNull(history);
-        assertNotNull(history.getHistoryEntries());
-        assertEquals(8, history.getHistoryEntries().size());
-
         List<HistoryEntry> entries = List.of(
                 new HistoryEntry("84599b3c", new Date(1485438707000L),
                         "Kryštof Tulinger <[email protected]>", null,
@@ -553,29 +548,34 @@ public void testHistory(boolean renamedHandling) throws Exception {
                         "Trond Norbye <[email protected]>", null,
                         "    Added a small test program\n\n", true,
                         Set.of("/git/Makefile", "/git/header.h", "/git/main.c")));
-        History expectedHistory = new History(entries);
-        assertEquals(expectedHistory, history);
 
+        List<String> expectedRenamedFiles = List.of("moved/renamed2.c", "moved2/renamed2.c", "moved/renamed.c");
+
+        History history = gitrepo.getHistory(root);
+        assertNotNull(history);
+        assertNotNull(history.getHistoryEntries());
+        assertEquals(entries.size(), history.getHistoryEntries().size());
+
+        History expectedHistory;
         if (renamedHandling) {
-            assertNotNull(history.getRenamedFiles());
-            assertEquals(3, history.getRenamedFiles().size());
-
-            assertTrue(history.isRenamed("moved/renamed2.c"));
-            assertTrue(history.isRenamed("moved2/renamed2.c"));
-            assertTrue(history.isRenamed("moved/renamed.c"));
-            assertFalse(history.isRenamed("non-existent.c"));
-            assertFalse(history.isRenamed("renamed.c"));
+            expectedHistory = new History(entries, expectedRenamedFiles);
         } else {
-            assertEquals(0, history.getRenamedFiles().size());
+            expectedHistory = new History(entries);
         }
+        assertEquals(expectedHistory, history);
 
         // Retry with start changeset.
         history = gitrepo.getHistory(root, "ce4c98ec");
         assertNotNull(history);
         assertNotNull(history.getHistoryEntries());
         assertEquals(4, history.getHistoryEntries().size());
-        assertEquals(0, history.getRenamedFiles().size());
-        expectedHistory = new History(entries.subList(0, 4));
+        if (renamedHandling) {
+            expectedHistory = new History(entries.subList(0, 4), expectedRenamedFiles);
+            assertEquals(expectedRenamedFiles.size(), history.getRenamedFiles().size());
+        } else {
+            expectedHistory = new History(entries.subList(0, 4));
+            assertEquals(0, history.getRenamedFiles().size());
+        }
         assertEquals(expectedHistory, history);
     }