InterIndexDiffFilterTest: Open TreeWalk in try-with-resource
Change-Id: Ie0046771b1ab1c9784d9a3bb597a9d76c6c3017d Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
This commit is contained in:
parent
6d33322df4
commit
de73fbf597
|
@ -76,10 +76,11 @@ public void setUp() throws Exception {
|
||||||
public void testEmpty() throws IOException {
|
public void testEmpty() throws IOException {
|
||||||
DirCache dc1 = DirCache.newInCore();
|
DirCache dc1 = DirCache.newInCore();
|
||||||
DirCache dc2 = DirCache.newInCore();
|
DirCache dc2 = DirCache.newInCore();
|
||||||
TreeWalk tw = new TreeWalk(db);
|
try (TreeWalk tw = new TreeWalk(db)) {
|
||||||
tw.addTree(new DirCacheIterator(dc1));
|
tw.addTree(new DirCacheIterator(dc1));
|
||||||
tw.addTree(new DirCacheIterator(dc2));
|
tw.addTree(new DirCacheIterator(dc2));
|
||||||
assertFalse(tw.next());
|
assertFalse(tw.next());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static final class AddEdit extends PathEdit {
|
static final class AddEdit extends PathEdit {
|
||||||
|
@ -124,14 +125,15 @@ public void testOneOnly() throws IOException {
|
||||||
editor.add(new AddEdit("a/a", FileMode.REGULAR_FILE, id("a"), 1, false));
|
editor.add(new AddEdit("a/a", FileMode.REGULAR_FILE, id("a"), 1, false));
|
||||||
editor.finish();
|
editor.finish();
|
||||||
|
|
||||||
TreeWalk tw = new TreeWalk(db);
|
try (TreeWalk tw = new TreeWalk(db)) {
|
||||||
tw.setRecursive(true);
|
tw.setRecursive(true);
|
||||||
tw.addTree(new DirCacheIterator(dc1));
|
tw.addTree(new DirCacheIterator(dc1));
|
||||||
tw.addTree(new DirCacheIterator(dc2));
|
tw.addTree(new DirCacheIterator(dc2));
|
||||||
tw.setFilter(InterIndexDiffFilter.INSTANCE);
|
tw.setFilter(InterIndexDiffFilter.INSTANCE);
|
||||||
assertTrue(tw.next());
|
assertTrue(tw.next());
|
||||||
assertEquals("a/a", tw.getPathString());
|
assertEquals("a/a", tw.getPathString());
|
||||||
assertFalse(tw.next());
|
assertFalse(tw.next());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
@ -145,13 +147,14 @@ public void testTwoSame() throws IOException {
|
||||||
ed2.add(new AddEdit("a/a", FileMode.REGULAR_FILE, id("a"), 1, false));
|
ed2.add(new AddEdit("a/a", FileMode.REGULAR_FILE, id("a"), 1, false));
|
||||||
ed2.finish();
|
ed2.finish();
|
||||||
|
|
||||||
TreeWalk tw = new TreeWalk(db);
|
try (TreeWalk tw = new TreeWalk(db)) {
|
||||||
tw.setRecursive(true);
|
tw.setRecursive(true);
|
||||||
tw.addTree(new DirCacheIterator(dc1));
|
tw.addTree(new DirCacheIterator(dc1));
|
||||||
tw.addTree(new DirCacheIterator(dc2));
|
tw.addTree(new DirCacheIterator(dc2));
|
||||||
tw.setFilter(InterIndexDiffFilter.INSTANCE);
|
tw.setFilter(InterIndexDiffFilter.INSTANCE);
|
||||||
|
|
||||||
assertFalse(tw.next());
|
assertFalse(tw.next());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
@ -165,15 +168,16 @@ public void testTwoSameDifferByAssumeValid() throws IOException {
|
||||||
ed2.add(new AddEdit("a/a", FileMode.REGULAR_FILE, id("a"), 1, true));
|
ed2.add(new AddEdit("a/a", FileMode.REGULAR_FILE, id("a"), 1, true));
|
||||||
ed2.finish();
|
ed2.finish();
|
||||||
|
|
||||||
TreeWalk tw = new TreeWalk(db);
|
try (TreeWalk tw = new TreeWalk(db)) {
|
||||||
tw.setRecursive(true);
|
tw.setRecursive(true);
|
||||||
tw.addTree(new DirCacheIterator(dc1));
|
tw.addTree(new DirCacheIterator(dc1));
|
||||||
tw.addTree(new DirCacheIterator(dc2));
|
tw.addTree(new DirCacheIterator(dc2));
|
||||||
tw.setFilter(InterIndexDiffFilter.INSTANCE);
|
tw.setFilter(InterIndexDiffFilter.INSTANCE);
|
||||||
|
|
||||||
assertTrue(tw.next());
|
assertTrue(tw.next());
|
||||||
assertEquals("a/a", tw.getPathString());
|
assertEquals("a/a", tw.getPathString());
|
||||||
assertFalse(tw.next());
|
assertFalse(tw.next());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
@ -188,12 +192,13 @@ public void testTwoSameSameAssumeValidDifferentContent()
|
||||||
ed2.add(new AddEdit("a/a", FileMode.REGULAR_FILE, id("b"), 1, true));
|
ed2.add(new AddEdit("a/a", FileMode.REGULAR_FILE, id("b"), 1, true));
|
||||||
ed2.finish();
|
ed2.finish();
|
||||||
|
|
||||||
TreeWalk tw = new TreeWalk(db);
|
try (TreeWalk tw = new TreeWalk(db)) {
|
||||||
tw.setRecursive(true);
|
tw.setRecursive(true);
|
||||||
tw.addTree(new DirCacheIterator(dc1));
|
tw.addTree(new DirCacheIterator(dc1));
|
||||||
tw.addTree(new DirCacheIterator(dc2));
|
tw.addTree(new DirCacheIterator(dc2));
|
||||||
tw.setFilter(InterIndexDiffFilter.INSTANCE);
|
tw.setFilter(InterIndexDiffFilter.INSTANCE);
|
||||||
|
|
||||||
assertFalse(tw.next());
|
assertFalse(tw.next());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue