Fix VCS test (#597)

* Fix VCS test

Copy test resource to a new test folder and test vcs extraction.
instead of relaying on the existence of this project .git folder.

* Fix Gradle tests

Author: talarian1

build-info-extractor/src/main/java/org/jfrog/build/extractor/clientConfiguration/util/GitUtils.java

@@ -6,8 +6,8 @@
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
-import org.jfrog.build.extractor.ci.Vcs;
 import org.jfrog.build.api.util.Log;
+import org.jfrog.build.extractor.ci.Vcs;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -196,7 +196,6 @@ private static String extractVcsMessage(File dotGit, Log log) throws IOException
         Repository repository = repositoryBuilder.setGitDir(dotGit)
                 .readEnvironment()
                 .findGitDir()
-                .setMustExist(true)
                 .build();
         RevCommit latestCommit;
         try {
@@ -206,7 +205,7 @@ private static String extractVcsMessage(File dotGit, Log log) throws IOException
             return "";
         }
 
-        return latestCommit.getFullMessage();
+        return latestCommit.getFullMessage().trim();
     }
 
     /**

build-info-extractor/src/test/java/org/jfrog/build/extractor/clientConfiguration/util/GitUtilsTest.java

@@ -21,16 +21,25 @@ public class GitUtilsTest {
      * Tests extracting Vcs details manually by comparing results to those received from the git executable
      */
     @Test
-    private void testReadGitConfig() throws IOException, InterruptedException {
-        File curDir = new File("").getAbsoluteFile();
-        Log testLog = new TestingLog();
-        Vcs vcs = GitUtils.extractVcs(curDir, testLog);
-
-        Assert.assertNotNull(vcs);
-        Assert.assertEquals(vcs.getUrl(), getGitUrlWithExecutor(curDir, testLog));
-        Assert.assertEquals(vcs.getRevision(), getGitRevisionWithExecutor(curDir, testLog));
-        Assert.assertEquals(vcs.getBranch(), getGitBranchWithExecutor(curDir, testLog));
-        Assert.assertEquals(vcs.getMessage(), getGitMessageWithExecutor(curDir, testLog));
+    private void testReadGitConfig() throws IOException, InterruptedException, URISyntaxException {
+        String gitResource = "git_simple_.git_suffix";
+        File testResourcesPath = new File(this.getClass().getResource("/gitutils").toURI()).getCanonicalFile();
+        File dotGitDir = new File(testResourcesPath, ".git").getAbsoluteFile();
+        try {
+            FileUtils.copyDirectory(new File(testResourcesPath, gitResource), dotGitDir);
+            Log testLog = new TestingLog();
+            Vcs vcs = GitUtils.extractVcs(dotGitDir, testLog);
+
+            Assert.assertNotNull(vcs);
+            Assert.assertEquals(vcs.getUrl(), getGitUrlWithExecutor(dotGitDir, testLog));
+            Assert.assertEquals(vcs.getRevision(), getGitRevisionWithExecutor(dotGitDir, testLog));
+            Assert.assertEquals(vcs.getBranch(), getGitBranchWithExecutor(dotGitDir, testLog));
+            Assert.assertEquals(vcs.getMessage(), getGitMessageWithExecutor(dotGitDir, testLog));
+
+        } finally {
+            // Cleanup.
+            FileUtils.deleteDirectory(dotGitDir);
+        }
     }
 
     private String getGitFieldWithExecutor(File execDir, Log log, List<String> args) throws IOException, InterruptedException {

build-info-extractor/src/test/resources/gitutils/git_simple_.git_suffix/HEAD

@@ -0,0 +1 @@
+ref: refs/heads/master

build-info-extractor/src/test/resources/gitutils/git_simple_.git_suffix/config

@@ -0,0 +1,2 @@
+[remote "origin"]
+url = https://github.com/jfrog/jfrog-cli-go.git

build-info-extractor/src/test/resources/gitutils/git_simple_.git_suffix/logs/HEAD

@@ -0,0 +1,4 @@
+0000000000000000000000000000000000000000 90d9cc9bf05666e6910bdfa4f914e96c706454c3 barbelity <barb@jfrog.com> 1550163053 +0200	commit (initial): TEST-1 - Adding file1.txt
+90d9cc9bf05666e6910bdfa4f914e96c706454c3 6198a6294722fdc75a570aac505784d2ec0d1818 barbelity <barb@jfrog.com> 1550163093 +0200	commit: TEST-2 - Adding text to file1.txt
+6198a6294722fdc75a570aac505784d2ec0d1818 a9eecfb2a71b8b0a73ecf027faf6d6f3739575dd barbelity <barb@jfrog.com> 1550172526 +0200	commit: TEST-3 - Adding file2.txt
+a9eecfb2a71b8b0a73ecf027faf6d6f3739575dd b033a0e508bdb52eee25654c9e12db33ff01b8ff barbelity <barb@jfrog.com> 1550172571 +0200	commit: TEST-4 - Adding text to file2.txt

build-info-extractor/src/test/resources/gitutils/git_simple_.git_suffix/objects/0e/58052bba5f3c26e64c68925d8a27f820dc6a15

@@ -0,0 +1,3 @@
+x
��K
+�0@]����̴�� �O��|Z+�H����������y�]�)�'�QB���F�4��4�xOܢ�N=%����Ή���D}���	�ٺ6R
+:�C��U�k/٧i,8�����:�a����-1�k�Zmv{+�J�.�[�@��e�~���]�TKEy

build-info-extractor/src/test/resources/gitutils/git_simple_.git_suffix/objects/43/20bb81c3d3b9d173b8efb911daa371ac3a0c0e

@@ -0,0 +1 @@
+b033a0e508bdb52eee25654c9e12db33ff01b8ff

build-info-extractor/src/test/resources/gitutils/git_simple_.git_suffix/objects/61/98a6294722fdc75a570aac505784d2ec0d1818

@@ -107,6 +107,7 @@ subprojects {
         from {
             configurations.uberJar.findAll { it.name.endsWith('jar') }.collect { zipTree(it) }
         }
+        exclude 'META-INF/*.RSA', 'META-INF/*.SF', 'META-INF/*.DSA'
         with jar
         archiveClassifier.set('uber')
     }
@@ -266,7 +267,7 @@ project('build-info-extractor') {
     apply plugin: 'java-test-fixtures'
     description = 'JFrog Build-Info Extractor'
     dependencies {
-        implementation 'org.eclipse.jgit:org.eclipse.jgit:5.1.16.202106041830-r'
+        implementation 'org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r'
         implementation project(':build-info-client')
         implementation project(':build-info-api')