ReflogTest: Open Git instances in try-with-resource
Change-Id: I950b6f16148cfe11de729b04904f88d6e4c28b9a Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
This commit is contained in:
parent
5ca9aaa172
commit
77887b49f9
|
@ -57,24 +57,27 @@ public void testClean() throws Exception {
|
|||
|
||||
@Test
|
||||
public void testSingleCommit() throws Exception {
|
||||
new Git(db).commit().setMessage("initial commit").call();
|
||||
try (Git git = new Git(db)) {
|
||||
git.commit().setMessage("initial commit").call();
|
||||
|
||||
assertEquals("6fd41be HEAD@{0}: commit (initial): initial commit",
|
||||
execute("git reflog")[0]);
|
||||
assertEquals("6fd41be HEAD@{0}: commit (initial): initial commit",
|
||||
execute("git reflog")[0]);
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testBranch() throws Exception {
|
||||
Git git = new Git(db);
|
||||
git.commit().setMessage("first commit").call();
|
||||
git.checkout().setCreateBranch(true).setName("side").call();
|
||||
writeTrashFile("file", "side content");
|
||||
git.add().addFilepattern("file").call();
|
||||
git.commit().setMessage("side commit").call();
|
||||
try (Git git = new Git(db)) {
|
||||
git.commit().setMessage("first commit").call();
|
||||
git.checkout().setCreateBranch(true).setName("side").call();
|
||||
writeTrashFile("file", "side content");
|
||||
git.add().addFilepattern("file").call();
|
||||
git.commit().setMessage("side commit").call();
|
||||
|
||||
assertArrayEquals(new String[] {
|
||||
"38890c7 side@{0}: commit: side commit",
|
||||
"d216986 side@{1}: branch: Created from commit first commit",
|
||||
"" }, execute("git reflog refs/heads/side"));
|
||||
assertArrayEquals(new String[] {
|
||||
"38890c7 side@{0}: commit: side commit",
|
||||
"d216986 side@{1}: branch: Created from commit first commit",
|
||||
"" }, execute("git reflog refs/heads/side"));
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue