PatchIdDiffFormatterTest: Open Git and PatchIdDiffFormatter in try-with-resource

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

org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/PatchIdDiffFormatterTest.java

@@ -61,12 +61,12 @@ public class PatchIdDiffFormatterTest extends RepositoryTestCase {
 		File folder = new File(db.getDirectory().getParent(), "folder");
 		folder.mkdir();
 		write(new File(folder, "folder.txt"), "folder");
-		Git git = new Git(db);
+		try (Git git = new Git(db);
+				PatchIdDiffFormatter df = new PatchIdDiffFormatter()) {
 			git.add().addFilepattern(".").call();
 			git.commit().setMessage("Initial commit").call();
 			write(new File(folder, "folder.txt"), "folder change");
 
-		PatchIdDiffFormatter df = new PatchIdDiffFormatter();
 			df.setRepository(db);
 			df.setPathFilter(PathFilter.create("folder"));
 			DirCacheIterator oldTree = new DirCacheIterator(db.readDirCache());
@@ -77,6 +77,7 @@ public class PatchIdDiffFormatterTest extends RepositoryTestCase {
 			assertEquals("1ff64e0f9333e9b81967c3e8d7a81362b14d5441", df
 					.getCalulatedPatchId().name());
 		}
+	}
 
 	@Test
 	public void testSameDiff() throws Exception {
@@ -84,12 +85,12 @@ public class PatchIdDiffFormatterTest extends RepositoryTestCase {
 		File folder = new File(db.getDirectory().getParent(), "folder");
 		folder.mkdir();
 		write(new File(folder, "folder.txt"), "\n\n\n\nfolder");
-		Git git = new Git(db);
+		try (Git git = new Git(db)) {
 			git.add().addFilepattern(".").call();
 			git.commit().setMessage("Initial commit").call();
 			write(new File(folder, "folder.txt"), "\n\n\n\nfolder change");
 
-		PatchIdDiffFormatter df = new PatchIdDiffFormatter();
+			try (PatchIdDiffFormatter df = new PatchIdDiffFormatter()) {
 				df.setRepository(db);
 				df.setPathFilter(PathFilter.create("folder"));
 				DirCacheIterator oldTree = new DirCacheIterator(db.readDirCache());
@@ -99,22 +100,25 @@ public class PatchIdDiffFormatterTest extends RepositoryTestCase {
 
 				assertEquals("08fca5ac531383eb1da8bf6b6f7cf44411281407", df
 						.getCalulatedPatchId().name());
+			}
 
 			write(new File(folder, "folder.txt"), "a\n\n\n\nfolder");
 			git.add().addFilepattern(".").call();
 			git.commit().setMessage("Initial commit").call();
 			write(new File(folder, "folder.txt"), "a\n\n\n\nfolder change");
 
-		df = new PatchIdDiffFormatter();
+			try (PatchIdDiffFormatter df = new PatchIdDiffFormatter()) {
 				df.setRepository(db);
 				df.setPathFilter(PathFilter.create("folder"));
-		oldTree = new DirCacheIterator(db.readDirCache());
-		newTree = new FileTreeIterator(db);
+				DirCacheIterator oldTree = new DirCacheIterator(db.readDirCache());
+				FileTreeIterator newTree = new FileTreeIterator(db);
 				df.format(oldTree, newTree);
 				df.flush();
 
 				assertEquals("08fca5ac531383eb1da8bf6b6f7cf44411281407", df
 						.getCalulatedPatchId().name());
 			}
+		}
+	}
 
 }