MergeCommandTest: Open TestRepository in try-with-resource

Change-Id: If620f6a98c5e8436a3edb4ee365ec02f41d0ea6a
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java
index 9af003d424a648f3ef5da09624caeaa8a88e6f41..5a15838029d24d9c8c99e5f1c13e1c842d6f0421 100644 (file)
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java
@@ -1557,32 +1557,37 @@ public class MergeCommandTest extends RepositoryTestCase {
 
        @Test
        public void testRecursiveMergeWithConflict() throws Exception {
-               TestRepository<Repository> db_t = new TestRepository<>(db);
-               BranchBuilder master = db_t.branch("master");
-               RevCommit m0 = master.commit().add("f", "1\n2\n3\n4\n5\n6\n7\n8\n9\n")
-                               .message("m0").create();
-               RevCommit m1 = master.commit()
-                               .add("f", "1-master\n2\n3\n4\n5\n6\n7\n8\n9\n").message("m1")
-                               .create();
-               db_t.getRevWalk().parseCommit(m1);
-
-               BranchBuilder side = db_t.branch("side");
-               RevCommit s1 = side.commit().parent(m0)
-                               .add("f", "1\n2\n3\n4\n5\n6\n7\n8\n9-side\n").message("s1")
-                               .create();
-               RevCommit s2 = side.commit().parent(m1)
-                               .add("f", "1-master\n2\n3\n4\n5\n6\n7-res(side)\n8\n9-side\n")
-                               .message("s2(merge)").create();
-               master.commit().parent(s1)
-                               .add("f", "1-master\n2\n3\n4\n5\n6\n7-conflict\n8\n9-side\n")
-                               .message("m2(merge)").create();
-
-               Git git = Git.wrap(db);
-               git.checkout().setName("master").call();
-
-               MergeResult result = git.merge().setStrategy(MergeStrategy.RECURSIVE)
-                               .include("side", s2).call();
-               assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus());
+               try (TestRepository<Repository> db_t = new TestRepository<>(db)) {
+                       BranchBuilder master = db_t.branch("master");
+                       RevCommit m0 = master.commit()
+                                       .add("f", "1\n2\n3\n4\n5\n6\n7\n8\n9\n").message("m0")
+                                       .create();
+                       RevCommit m1 = master.commit()
+                                       .add("f", "1-master\n2\n3\n4\n5\n6\n7\n8\n9\n")
+                                       .message("m1").create();
+                       db_t.getRevWalk().parseCommit(m1);
+
+                       BranchBuilder side = db_t.branch("side");
+                       RevCommit s1 = side.commit().parent(m0)
+                                       .add("f", "1\n2\n3\n4\n5\n6\n7\n8\n9-side\n").message("s1")
+                                       .create();
+                       RevCommit s2 = side.commit().parent(m1)
+                                       .add("f",
+                                                       "1-master\n2\n3\n4\n5\n6\n7-res(side)\n8\n9-side\n")
+                                       .message("s2(merge)").create();
+                       master.commit().parent(s1)
+                                       .add("f",
+                                                       "1-master\n2\n3\n4\n5\n6\n7-conflict\n8\n9-side\n")
+                                       .message("m2(merge)").create();
+
+                       Git git = Git.wrap(db);
+                       git.checkout().setName("master").call();
+
+                       MergeResult result = git.merge()
+                                       .setStrategy(MergeStrategy.RECURSIVE).include("side", s2)
+                                       .call();
+                       assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus());
+               }
        }
 
        private Ref prepareSuccessfulMerge(Git git) throws Exception {