]> source.dussan.org Git - jgit.git/commitdiff
DirCacheBuilderIteratorTest: Open TreeWalk in try-with-resource 92/66592/1
authorDavid Pursehouse <david.pursehouse@sonymobile.com>
Mon, 15 Feb 2016 08:17:17 +0000 (17:17 +0900)
committerDavid Pursehouse <david.pursehouse@sonymobile.com>
Mon, 15 Feb 2016 08:17:17 +0000 (17:17 +0900)
Change-Id: I94836315918924cba9a2b5be6b9ae417cb2ad215
Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
org.eclipse.jgit.test/tst/org/eclipse/jgit/dircache/DirCacheBuilderIteratorTest.java

index 8561fdf35b951f9abdd5769909726c5c46d67206..2b108870f9fb8dc2329e727aa4991f813921bf9d 100644 (file)
@@ -78,23 +78,24 @@ public class DirCacheBuilderIteratorTest extends RepositoryTestCase {
 
                final int expIdx = 2;
                final DirCacheBuilder b = dc.builder();
-               final TreeWalk tw = new TreeWalk(db);
-               tw.addTree(new DirCacheBuildIterator(b));
-               tw.setRecursive(true);
-               tw.setFilter(PathFilterGroup.createFromStrings(Collections
-                               .singleton(paths[expIdx])));
+               try (final TreeWalk tw = new TreeWalk(db)) {
+                       tw.addTree(new DirCacheBuildIterator(b));
+                       tw.setRecursive(true);
+                       tw.setFilter(PathFilterGroup.createFromStrings(Collections
+                                       .singleton(paths[expIdx])));
 
-               assertTrue("found " + paths[expIdx], tw.next());
-               final DirCacheIterator c = tw.getTree(0, DirCacheIterator.class);
-               assertNotNull(c);
-               assertEquals(expIdx, c.ptr);
-               assertSame(ents[expIdx], c.getDirCacheEntry());
-               assertEquals(paths[expIdx], tw.getPathString());
-               assertEquals(mode.getBits(), tw.getRawMode(0));
-               assertSame(mode, tw.getFileMode(0));
-               b.add(c.getDirCacheEntry());
+                       assertTrue("found " + paths[expIdx], tw.next());
+                       final DirCacheIterator c = tw.getTree(0, DirCacheIterator.class);
+                       assertNotNull(c);
+                       assertEquals(expIdx, c.ptr);
+                       assertSame(ents[expIdx], c.getDirCacheEntry());
+                       assertEquals(paths[expIdx], tw.getPathString());
+                       assertEquals(mode.getBits(), tw.getRawMode(0));
+                       assertSame(mode, tw.getFileMode(0));
+                       b.add(c.getDirCacheEntry());
 
-               assertFalse("no more entries", tw.next());
+                       assertFalse("no more entries", tw.next());
+               }
 
                b.finish();
                assertEquals(ents.length, dc.getEntryCount());