Browse Source

ReflogTest: Open Git instances in try-with-resource

Change-Id: I950b6f16148cfe11de729b04904f88d6e4c28b9a
Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
tags/v4.3.0.201603230630-rc1
David Pursehouse 8 years ago
parent
commit
77887b49f9
1 changed files with 16 additions and 13 deletions
  1. 16
    13
      org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ReflogTest.java

+ 16
- 13
org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ReflogTest.java View File

@@ -57,24 +57,27 @@ public class ReflogTest extends CLIRepositoryTestCase {

@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…
Cancel
Save