try with resources

Author: autayeu

src/test/java/pl/project13/jgit/DescribeCommandAbbrevIntegrationTest.java

@@ -18,6 +18,7 @@
 package pl.project13.jgit;
 
 import com.google.common.base.Optional;
+import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.lib.Repository;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Test;
@@ -64,20 +65,20 @@ public void shouldGiveTheCommitIdAndDirtyMarkerWhenNothingElseCanBeFound() throw
         .withGitRepoInParent(AvailableGitTestRepo.WITH_LIGHTWEIGHT_TAG_BEFORE_ANNOTATED_TAG)
         .create();
 
-    Repository repo = git().getRepository();
+    try (final Git git = git(); final Repository repo = git.getRepository()) {
+      // when
+      DescribeResult res = DescribeCommand
+              .on(repo)
+              .withMojo(mojo)
+              .abbrev(2) // 2 is enough to be unique in this small repo
+              .call();
 
-    // when
-    DescribeResult res = DescribeCommand
-        .on(repo)
-        .withMojo(mojo)
-        .abbrev(2) // 2 is enough to be unique in this small repo
-        .call();
+      // then
+      // git will notice this, and fallback to use 4 chars
+      String smallestAbbrevGitWillUse = abbrev("b6a73ed747dd8dc98642d731ddbf09824efb9d48", 2);
 
-    // then
-    // git will notice this, and fallback to use 4 chars
-    String smallestAbbrevGitWillUse = abbrev("b6a73ed747dd8dc98642d731ddbf09824efb9d48", 2);
-
-    assertThat(res.prefixedCommitId()).isEqualTo("g" + smallestAbbrevGitWillUse);
+      assertThat(res.prefixedCommitId()).isEqualTo("g" + smallestAbbrevGitWillUse);
+    }
   }
 
   @Test
@@ -89,20 +90,20 @@ public void onGitCommitIdsRepo_shouldNoticeThat2CharsIsTooLittleToBeUniqueAndUse
         .withGitRepoInParent(AvailableGitTestRepo.GIT_COMMIT_ID)
         .create();
 
-    Repository repo = git().getRepository();
-
-    // when
-    DescribeResult res = DescribeCommand
-        .on(repo)
-        .withMojo(mojo)
-        .abbrev(2) // way too small to be unique in git-commit-id's repo!
-        .call();
+    try (final Git git = git(); final Repository repo = git.getRepository()) {
+      // when
+      DescribeResult res = DescribeCommand
+              .on(repo)
+              .withMojo(mojo)
+              .abbrev(2) // way too small to be unique in git-commit-id's repo!
+              .call();
 
-    // then
-    // git will notice this, and fallback to use 4 chars
-    String smallestAbbrevGitWillUse = abbrev("7181832b7d9afdeb86c32cf51214abfca63625be", 4);
+      // then
+      // git will notice this, and fallback to use 4 chars
+      String smallestAbbrevGitWillUse = abbrev("7181832b7d9afdeb86c32cf51214abfca63625be", 4);
 
-    assertThat(res.prefixedCommitId()).isEqualTo("g" + smallestAbbrevGitWillUse);
+      assertThat(res.prefixedCommitId()).isEqualTo("g" + smallestAbbrevGitWillUse);
+    }
   }
 
   String abbrev(@NotNull String id, int n) {