more test refactoring

Author: Vladimir Kotal

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

@@ -639,16 +639,42 @@ public void testRenamedSingleHistory() throws Exception {
     }
 
     @Test
-    public void testBuildTagList() throws Exception {
+    public void testBuildTagListEmpty() throws Exception {
         File root = new File(repository.getSourceRoot(), "git");
-        GitRepository gitrepo
-                = (GitRepository) RepositoryFactory.getRepository(root);
-        gitrepo.buildTagList(new File(gitrepo.getDirectoryName()), CommandTimeoutType.INDEXER);
-        assertEquals(0, gitrepo.getTagList().size());
+        // Clone under source root to avoid problems with prohibited symlinks.
+        File localPath = new File(repository.getSourceRoot(), "testBuildTagListEmpty");
+        String cloneUrl = root.toURI().toString();
+        try (Git gitClone = Git.cloneRepository()
+                .setURI(cloneUrl)
+                .setDirectory(localPath)
+                .call()) {
+
+            File cloneRoot = gitClone.getRepository().getWorkTree();
+
+            GitRepository gitrepo = (GitRepository) RepositoryFactory.getRepository(cloneRoot);
+            gitrepo.buildTagList(new File(gitrepo.getDirectoryName()), CommandTimeoutType.INDEXER);
+            assertEquals(0, gitrepo.getTagList().size());
+
+            FileUtilities.removeDirs(cloneRoot);
+        }
+    }
+
+    @Test
+    public void testBuildTagListMultipleTags() throws Exception {
+        File root = new File(repository.getSourceRoot(), "git");
+        // Clone under source root to avoid problems with prohibited symlinks.
+        File localPath = new File(repository.getSourceRoot(), "testBuildTagListMultipleTags");
+        String cloneUrl = root.toURI().toString();
+        try (Git gitClone = Git.cloneRepository()
+                .setURI(cloneUrl)
+                .setDirectory(localPath)
+                .call()) {
+
+            File cloneRoot = gitClone.getRepository().getWorkTree();
+            GitRepository gitrepo = (GitRepository) RepositoryFactory.getRepository(cloneRoot);
 
-        try (Git git = Git.open(root)) {
             // Tag the HEAD first.
-            Ref ref = git.tag().setName("one").call();
+            Ref ref = gitClone.tag().setName("one").call();
             assertNotNull(ref);
             gitrepo.buildTagList(new File(gitrepo.getDirectoryName()), CommandTimeoutType.INDEXER);
             Set<TagEntry> tags = gitrepo.getTagList();
@@ -658,7 +684,7 @@ public void testBuildTagList() throws Exception {
             assertEquals(tagEntry, tags.toArray()[0]);
 
             // Tag again so that single changeset has multiple tags.
-            ref = git.tag().setName("two").call();
+            ref = gitClone.tag().setName("two").call();
             assertNotNull(ref);
             gitrepo.buildTagList(new File(gitrepo.getDirectoryName()), CommandTimeoutType.INDEXER);
             tags = gitrepo.getTagList();
@@ -669,23 +695,44 @@ public void testBuildTagList() throws Exception {
             expectedTags.add(tagEntry);
             assertEquals(expectedTags, tags);
 
+            FileUtilities.removeDirs(cloneRoot);
+        }
+    }
+
+    @Test
+    public void testBuildTagListNotHead() throws Exception {
+        File root = new File(repository.getSourceRoot(), "git");
+        // Clone under source root to avoid problems with prohibited symlinks.
+        File localPath = new File(repository.getSourceRoot(), "testBuildTagListNotHead");
+        String cloneUrl = root.toURI().toString();
+        try (Git gitClone = Git.cloneRepository()
+                .setURI(cloneUrl)
+                .setDirectory(localPath)
+                .call()) {
+
+            File cloneRoot = gitClone.getRepository().getWorkTree();
+            GitRepository gitrepo = (GitRepository) RepositoryFactory.getRepository(cloneRoot);
+
             // Tag specific changeset (not HEAD) and recheck.
-            org.eclipse.jgit.lib.Repository repo = git.getRepository();
+            org.eclipse.jgit.lib.Repository repo = gitClone.getRepository();
             RevCommit commit;
             ObjectId objectId = repo.resolve("b6413947a5");
             try (RevWalk walk = new RevWalk(repo)) {
                 commit = walk.parseCommit(objectId);
             }
             assertNotNull(commit);
-            ref = git.tag().setName("three").setObjectId(commit).call();
+            Ref ref = gitClone.tag().setName("three").setObjectId(commit).call();
             assertNotNull(ref);
             gitrepo.buildTagList(new File(gitrepo.getDirectoryName()), CommandTimeoutType.INDEXER);
-            tags = gitrepo.getTagList();
-            assertEquals(2, tags.size());
-            date = new Date((long) (1485263264) * 1000);
-            tagEntry = new GitTagEntry("b6413947a59f481ddc0a05e0d181731233557f6e", date, "three");
+            Set<TagEntry> tags = gitrepo.getTagList();
+            assertEquals(1, tags.size());
+            Date date = new Date((long) (1485263264) * 1000);
+            Set<TagEntry> expectedTags = new TreeSet<>();
+            TagEntry tagEntry = new GitTagEntry("b6413947a59f481ddc0a05e0d181731233557f6e", date, "three");
             expectedTags.add(tagEntry);
             assertEquals(expectedTags, tags);
+
+            FileUtilities.removeDirs(cloneRoot);
         }
     }
 }