From 9d721de69bd160c070f6de7ce6a011fd955c9679 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 14 Jan 2016 17:38:18 +0900 Subject: [PATCH] BranchTest: Create Git instances in try-with-resource Change-Id: I8becee479fab91a18e6daffd6f4fd57338c9d120 Signed-off-by: David Pursehouse --- .../tst/org/eclipse/jgit/pgm/BranchTest.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/BranchTest.java b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/BranchTest.java index 4200cd05c..d1bd5bace 100644 --- a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/BranchTest.java +++ b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/BranchTest.java @@ -57,7 +57,9 @@ public class BranchTest extends CLIRepositoryTestCase { @Before public void setUp() throws Exception { super.setUp(); - new Git(db).commit().setMessage("initial commit").call(); + try (Git git = new Git(db)) { + git.commit().setMessage("initial commit").call(); + } } @Test @@ -77,13 +79,15 @@ public void testListDetached() throws Exception { @Test public void testListContains() throws Exception { - new Git(db).branchCreate().setName("initial").call(); - RevCommit second = new Git(db).commit().setMessage("second commit") - .call(); - assertArrayOfLinesEquals(new String[] { " initial", "* master", "" }, - execute("git branch --contains 6fd41be")); - assertArrayOfLinesEquals(new String[] { "* master", "" }, - execute("git branch --contains " + second.name())); + try (Git git = new Git(db)) { + git.branchCreate().setName("initial").call(); + RevCommit second = git.commit().setMessage("second commit") + .call(); + assertArrayOfLinesEquals(new String[] { " initial", "* master", "" }, + execute("git branch --contains 6fd41be")); + assertArrayOfLinesEquals(new String[] { "* master", "" }, + execute("git branch --contains " + second.name())); + } } @Test