motiejus
/
jgit
1
Fork 0
Code Releases Activity

DiffEntryTest: Open Git and TreeWalk in try-with-resource 

Change-Id: If4a49268b9b7ec3a44ed1508ed78db365b0c9e5b
Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
This commit is contained in:
David Pursehouse 2016-01-25 11:55:46 +09:00
parent 6b66240311
commit 4c128b0764
1 changed files with 240 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffEntryTest.java
View File

@ -77,12 +77,12 @@ public class DiffEntryTest extends RepositoryTestCase {
public void shouldListAddedFileInInitialCommit() throws Exception { public void shouldListAddedFileInInitialCommit() throws Exception {
// given // given
writeTrashFile("a.txt", "content"); writeTrashFile("a.txt", "content");
Git git = new Git(db); try (Git git = new Git(db);
TreeWalk walk = new TreeWalk(db)) {
git.add().addFilepattern("a.txt").call(); git.add().addFilepattern("a.txt").call();
RevCommit c = git.commit().setMessage("initial commit").call(); RevCommit c = git.commit().setMessage("initial commit").call();
// when // when
TreeWalk walk = new TreeWalk(db);
walk.addTree(new EmptyTreeIterator()); walk.addTree(new EmptyTreeIterator());
walk.addTree(c.getTree()); walk.addTree(c.getTree());
List<DiffEntry> result = DiffEntry.scan(walk); List<DiffEntry> result = DiffEntry.scan(walk);
@ -96,18 +96,19 @@ public void shouldListAddedFileInInitialCommit() throws Exception {
assertThat(entry.getNewPath(), is("a.txt")); assertThat(entry.getNewPath(), is("a.txt"));
assertThat(entry.getOldPath(), is(DEV_NULL)); assertThat(entry.getOldPath(), is(DEV_NULL));
} }
}
@Test @Test
public void shouldListAddedFileBetweenTwoCommits() throws Exception { public void shouldListAddedFileBetweenTwoCommits() throws Exception {
// given // given
Git git = new Git(db); try (Git git = new Git(db);
TreeWalk walk = new TreeWalk(db)) {
RevCommit c1 = git.commit().setMessage("initial commit").call(); RevCommit c1 = git.commit().setMessage("initial commit").call();
writeTrashFile("a.txt", "content"); writeTrashFile("a.txt", "content");
git.add().addFilepattern("a.txt").call(); git.add().addFilepattern("a.txt").call();
RevCommit c2 = git.commit().setMessage("second commit").call(); RevCommit c2 = git.commit().setMessage("second commit").call();
// when // when
TreeWalk walk = new TreeWalk(db);
walk.addTree(c1.getTree()); walk.addTree(c1.getTree());
walk.addTree(c2.getTree()); walk.addTree(c2.getTree());
List<DiffEntry> result = DiffEntry.scan(walk); List<DiffEntry> result = DiffEntry.scan(walk);
@ -121,11 +122,13 @@ public void shouldListAddedFileBetweenTwoCommits() throws Exception {
assertThat(entry.getNewPath(), is("a.txt")); assertThat(entry.getNewPath(), is("a.txt"));
assertThat(entry.getOldPath(), is(DEV_NULL)); assertThat(entry.getOldPath(), is(DEV_NULL));
} }
}
@Test @Test
public void shouldListModificationBetweenTwoCommits() throws Exception { public void shouldListModificationBetweenTwoCommits() throws Exception {
// given // given
Git git = new Git(db); try (Git git = new Git(db);
TreeWalk walk = new TreeWalk(db)) {
File file = writeTrashFile("a.txt", "content"); File file = writeTrashFile("a.txt", "content");
git.add().addFilepattern("a.txt").call(); git.add().addFilepattern("a.txt").call();
RevCommit c1 = git.commit().setMessage("initial commit").call(); RevCommit c1 = git.commit().setMessage("initial commit").call();
@ -134,7 +137,6 @@ public void shouldListModificationBetweenTwoCommits() throws Exception {
.call(); .call();
// when // when
TreeWalk walk = new TreeWalk(db);
walk.addTree(c1.getTree()); walk.addTree(c1.getTree());
walk.addTree(c2.getTree()); walk.addTree(c2.getTree());
List<DiffEntry> result = DiffEntry.scan(walk); List<DiffEntry> result = DiffEntry.scan(walk);
@ -147,11 +149,13 @@ public void shouldListModificationBetweenTwoCommits() throws Exception {
assertThat(entry.getChangeType(), is(ChangeType.MODIFY)); assertThat(entry.getChangeType(), is(ChangeType.MODIFY));
assertThat(entry.getNewPath(), is("a.txt")); assertThat(entry.getNewPath(), is("a.txt"));
} }
}
@Test @Test
public void shouldListDeletionBetweenTwoCommits() throws Exception { public void shouldListDeletionBetweenTwoCommits() throws Exception {
// given // given
Git git = new Git(db); try (Git git = new Git(db);
TreeWalk walk = new TreeWalk(db)) {
File file = writeTrashFile("a.txt", "content"); File file = writeTrashFile("a.txt", "content");
git.add().addFilepattern("a.txt").call(); git.add().addFilepattern("a.txt").call();
RevCommit c1 = git.commit().setMessage("initial commit").call(); RevCommit c1 = git.commit().setMessage("initial commit").call();
@ -160,7 +164,6 @@ public void shouldListDeletionBetweenTwoCommits() throws Exception {
.call(); .call();
// when // when
TreeWalk walk = new TreeWalk(db);
walk.addTree(c1.getTree()); walk.addTree(c1.getTree());
walk.addTree(c2.getTree()); walk.addTree(c2.getTree());
List<DiffEntry> result = DiffEntry.scan(walk); List<DiffEntry> result = DiffEntry.scan(walk);
@ -174,12 +177,14 @@ public void shouldListDeletionBetweenTwoCommits() throws Exception {
assertThat(entry.getNewPath(), is(DEV_NULL)); assertThat(entry.getNewPath(), is(DEV_NULL));
assertThat(entry.getChangeType(), is(ChangeType.DELETE)); assertThat(entry.getChangeType(), is(ChangeType.DELETE));
} }
}
@Test @Test
public void shouldListModificationInDirWithoutModifiedTrees() public void shouldListModificationInDirWithoutModifiedTrees()
throws Exception { throws Exception {
// given // given
Git git = new Git(db); try (Git git = new Git(db);
TreeWalk walk = new TreeWalk(db)) {
File tree = new File(new File(db.getWorkTree(), "a"), "b"); File tree = new File(new File(db.getWorkTree(), "a"), "b");
FileUtils.mkdirs(tree); FileUtils.mkdirs(tree);
File file = new File(tree, "c.txt"); File file = new File(tree, "c.txt");
@ -192,7 +197,6 @@ public void shouldListModificationInDirWithoutModifiedTrees()
.call(); .call();
// when // when
TreeWalk walk = new TreeWalk(db);
walk.addTree(c1.getTree()); walk.addTree(c1.getTree());
walk.addTree(c2.getTree()); walk.addTree(c2.getTree());
walk.setRecursive(true); walk.setRecursive(true);
@ -206,11 +210,13 @@ public void shouldListModificationInDirWithoutModifiedTrees()
assertThat(entry.getChangeType(), is(ChangeType.MODIFY)); assertThat(entry.getChangeType(), is(ChangeType.MODIFY));
assertThat(entry.getNewPath(), is("a/b/c.txt")); assertThat(entry.getNewPath(), is("a/b/c.txt"));
} }
}
@Test @Test
public void shouldListModificationInDirWithModifiedTrees() throws Exception { public void shouldListModificationInDirWithModifiedTrees() throws Exception {
// given // given
Git git = new Git(db); try (Git git = new Git(db);
TreeWalk walk = new TreeWalk(db)) {
File tree = new File(new File(db.getWorkTree(), "a"), "b"); File tree = new File(new File(db.getWorkTree(), "a"), "b");
FileUtils.mkdirs(tree); FileUtils.mkdirs(tree);
File file = new File(tree, "c.txt"); File file = new File(tree, "c.txt");
@ -223,7 +229,6 @@ public void shouldListModificationInDirWithModifiedTrees() throws Exception {
.call(); .call();
// when // when
TreeWalk walk = new TreeWalk(db);
walk.addTree(c1.getTree()); walk.addTree(c1.getTree());
walk.addTree(c2.getTree()); walk.addTree(c2.getTree());
List<DiffEntry> result = DiffEntry.scan(walk, true); List<DiffEntry> result = DiffEntry.scan(walk, true);
@ -244,18 +249,19 @@ public void shouldListModificationInDirWithModifiedTrees() throws Exception {
assertThat(entry.getChangeType(), is(ChangeType.MODIFY)); assertThat(entry.getChangeType(), is(ChangeType.MODIFY));
assertThat(entry.getNewPath(), is("a/b/c.txt")); assertThat(entry.getNewPath(), is("a/b/c.txt"));
} }
}
@Test @Test
public void shouldListChangesInWorkingTree() throws Exception { public void shouldListChangesInWorkingTree() throws Exception {
// given // given
writeTrashFile("a.txt", "content"); writeTrashFile("a.txt", "content");
Git git = new Git(db); try (Git git = new Git(db);
TreeWalk walk = new TreeWalk(db)) {
git.add().addFilepattern("a.txt").call(); git.add().addFilepattern("a.txt").call();
RevCommit c = git.commit().setMessage("initial commit").call(); RevCommit c = git.commit().setMessage("initial commit").call();
writeTrashFile("b.txt", "new line"); writeTrashFile("b.txt", "new line");
// when // when
TreeWalk walk = new TreeWalk(db);
walk.addTree(c.getTree()); walk.addTree(c.getTree());
walk.addTree(new FileTreeIterator(db)); walk.addTree(new FileTreeIterator(db));
List<DiffEntry> result = DiffEntry.scan(walk, true); List<DiffEntry> result = DiffEntry.scan(walk, true);
@ -267,11 +273,13 @@ public void shouldListChangesInWorkingTree() throws Exception {
assertThat(entry.getChangeType(), is(ChangeType.ADD)); assertThat(entry.getChangeType(), is(ChangeType.ADD));
assertThat(entry.getNewPath(), is("b.txt")); assertThat(entry.getNewPath(), is("b.txt"));
} }
}
@Test @Test
public void shouldMarkEntriesWhenGivenMarkTreeFilter() throws Exception { public void shouldMarkEntriesWhenGivenMarkTreeFilter() throws Exception {
// given // given
Git git = new Git(db); try (Git git = new Git(db);
TreeWalk walk = new TreeWalk(db)) {
RevCommit c1 = git.commit().setMessage("initial commit").call(); RevCommit c1 = git.commit().setMessage("initial commit").call();
FileUtils.mkdir(new File(db.getWorkTree(), "b")); FileUtils.mkdir(new File(db.getWorkTree(), "b"));
writeTrashFile("a.txt", "a"); writeTrashFile("a.txt", "a");
@ -286,7 +294,6 @@ public void shouldMarkEntriesWhenGivenMarkTreeFilter() throws Exception {
TreeFilter filterB2 = PathFilterGroup.createFromStrings("b/2.txt"); TreeFilter filterB2 = PathFilterGroup.createFromStrings("b/2.txt");
// when // when
TreeWalk walk = new TreeWalk(db);
walk.addTree(c1.getTree()); walk.addTree(c1.getTree());
walk.addTree(c2.getTree()); walk.addTree(c2.getTree());
List<DiffEntry> result = DiffEntry.scan(walk, true, new TreeFilter[] { List<DiffEntry> result = DiffEntry.scan(walk, true, new TreeFilter[] {
@ -332,6 +339,7 @@ public void shouldMarkEntriesWhenGivenMarkTreeFilter() throws Exception {
assertFalse(entryC.isMarked(2)); assertFalse(entryC.isMarked(2));
assertEquals(0, entryC.getTreeFilterMarks()); assertEquals(0, entryC.getTreeFilterMarks());
} }
}
@Test(expected = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
public void shouldThrowIAEWhenTreeWalkHasLessThanTwoTrees() public void shouldThrowIAEWhenTreeWalkHasLessThanTwoTrees()
@ -339,10 +347,11 @@ public void shouldThrowIAEWhenTreeWalkHasLessThanTwoTrees()
// given - we don't need anything here // given - we don't need anything here
// when // when
TreeWalk walk = new TreeWalk(db); try (TreeWalk walk = new TreeWalk(db)) {
walk.addTree(new EmptyTreeIterator()); walk.addTree(new EmptyTreeIterator());
DiffEntry.scan(walk); DiffEntry.scan(walk);
} }
}
@Test(expected = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
public void shouldThrowIAEWhenTreeWalkHasMoreThanTwoTrees() public void shouldThrowIAEWhenTreeWalkHasMoreThanTwoTrees()
@ -350,12 +359,13 @@ public void shouldThrowIAEWhenTreeWalkHasMoreThanTwoTrees()
// given - we don't need anything here // given - we don't need anything here
// when // when
TreeWalk walk = new TreeWalk(db); try (TreeWalk walk = new TreeWalk(db)) {
walk.addTree(new EmptyTreeIterator()); walk.addTree(new EmptyTreeIterator());
walk.addTree(new EmptyTreeIterator()); walk.addTree(new EmptyTreeIterator());
walk.addTree(new EmptyTreeIterator()); walk.addTree(new EmptyTreeIterator());
DiffEntry.scan(walk); DiffEntry.scan(walk);
} }
}
@Test(expected = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
public void shouldThrowIAEWhenScanShouldIncludeTreesAndWalkIsRecursive() public void shouldThrowIAEWhenScanShouldIncludeTreesAndWalkIsRecursive()
@ -363,28 +373,28 @@ public void shouldThrowIAEWhenScanShouldIncludeTreesAndWalkIsRecursive()
// given - we don't need anything here // given - we don't need anything here
// when // when
TreeWalk walk = new TreeWalk(db); try (TreeWalk walk = new TreeWalk(db)) {
walk.addTree(new EmptyTreeIterator()); walk.addTree(new EmptyTreeIterator());
walk.addTree(new EmptyTreeIterator()); walk.addTree(new EmptyTreeIterator());
walk.setRecursive(true); walk.setRecursive(true);
DiffEntry.scan(walk, true); DiffEntry.scan(walk, true);
} }
}
@Test @Test
public void shouldReportFileModeChange() throws Exception { public void shouldReportFileModeChange() throws Exception {
writeTrashFile("a.txt", "content"); writeTrashFile("a.txt", "content");
Git git = new Git(db); try (Git git = new Git(db);
TreeWalk walk = new TreeWalk(db)) {
git.add().addFilepattern("a.txt").call(); git.add().addFilepattern("a.txt").call();
RevCommit c1 = git.commit().setMessage("initial commit").call(); RevCommit c1 = git.commit().setMessage("initial commit").call();
DirCache cache = db.lockDirCache(); DirCache cache = db.lockDirCache();
DirCacheEditor editor = cache.editor(); DirCacheEditor editor = cache.editor();
final TreeWalk walk = new TreeWalk(db);
walk.addTree(c1.getTree()); walk.addTree(c1.getTree());
walk.setRecursive(true); walk.setRecursive(true);
assertTrue(walk.next()); assertTrue(walk.next());
editor.add(new PathEdit("a.txt") { editor.add(new PathEdit("a.txt") {
public void apply(DirCacheEntry ent) { public void apply(DirCacheEntry ent) {
ent.setFileMode(FileMode.EXECUTABLE_FILE); ent.setFileMode(FileMode.EXECUTABLE_FILE);
ent.setObjectId(walk.getObjectId(0)); ent.setObjectId(walk.getObjectId(0));
@ -405,4 +415,5 @@ public void apply(DirCacheEntry ent) {
assertEquals(FileMode.EXECUTABLE_FILE, diff.getNewMode()); assertEquals(FileMode.EXECUTABLE_FILE, diff.getNewMode());
assertEquals(FileMode.REGULAR_FILE, diff.getOldMode()); assertEquals(FileMode.REGULAR_FILE, diff.getOldMode());
} }
}
} }