ReflogResolveTest: Open Git instances in try-with-resource
Change-Id: I11ee38bfcf4951bf05a1632df08b1d074d38338b Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
This commit is contained in:
parent
77887b49f9
commit
952f381981
|
@ -60,7 +60,7 @@ public class ReflogResolveTest extends RepositoryTestCase {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void resolveMasterCommits() throws Exception {
|
public void resolveMasterCommits() throws Exception {
|
||||||
Git git = new Git(db);
|
try (Git git = new Git(db)) {
|
||||||
writeTrashFile("file.txt", "content");
|
writeTrashFile("file.txt", "content");
|
||||||
git.add().addFilepattern("file.txt").call();
|
git.add().addFilepattern("file.txt").call();
|
||||||
RevCommit c1 = git.commit().setMessage("create file").call();
|
RevCommit c1 = git.commit().setMessage("create file").call();
|
||||||
|
@ -71,10 +71,11 @@ public void resolveMasterCommits() throws Exception {
|
||||||
assertEquals(c2, db.resolve("master@{0}"));
|
assertEquals(c2, db.resolve("master@{0}"));
|
||||||
assertEquals(c1, db.resolve("master@{1}"));
|
assertEquals(c1, db.resolve("master@{1}"));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void resolveUnnamedCurrentBranchCommits() throws Exception {
|
public void resolveUnnamedCurrentBranchCommits() throws Exception {
|
||||||
Git git = new Git(db);
|
try (Git git = new Git(db)) {
|
||||||
writeTrashFile("file.txt", "content");
|
writeTrashFile("file.txt", "content");
|
||||||
git.add().addFilepattern("file.txt").call();
|
git.add().addFilepattern("file.txt").call();
|
||||||
RevCommit c1 = git.commit().setMessage("create file").call();
|
RevCommit c1 = git.commit().setMessage("create file").call();
|
||||||
|
@ -103,10 +104,11 @@ public void resolveUnnamedCurrentBranchCommits() throws Exception {
|
||||||
assertEquals(c1, db.resolve("@{1}"));
|
assertEquals(c1, db.resolve("@{1}"));
|
||||||
assertEquals(c2, db.resolve("@{2}"));
|
assertEquals(c2, db.resolve("@{2}"));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void resolveReflogParent() throws Exception {
|
public void resolveReflogParent() throws Exception {
|
||||||
Git git = new Git(db);
|
try (Git git = new Git(db)) {
|
||||||
writeTrashFile("file.txt", "content");
|
writeTrashFile("file.txt", "content");
|
||||||
git.add().addFilepattern("file.txt").call();
|
git.add().addFilepattern("file.txt").call();
|
||||||
RevCommit c1 = git.commit().setMessage("create file").call();
|
RevCommit c1 = git.commit().setMessage("create file").call();
|
||||||
|
@ -116,19 +118,21 @@ public void resolveReflogParent() throws Exception {
|
||||||
|
|
||||||
assertEquals(c1, db.resolve("master@{0}~1"));
|
assertEquals(c1, db.resolve("master@{0}~1"));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void resolveNonExistingBranch() throws Exception {
|
public void resolveNonExistingBranch() throws Exception {
|
||||||
Git git = new Git(db);
|
try (Git git = new Git(db)) {
|
||||||
writeTrashFile("file.txt", "content");
|
writeTrashFile("file.txt", "content");
|
||||||
git.add().addFilepattern("file.txt").call();
|
git.add().addFilepattern("file.txt").call();
|
||||||
git.commit().setMessage("create file").call();
|
git.commit().setMessage("create file").call();
|
||||||
assertNull(db.resolve("notabranch@{7}"));
|
assertNull(db.resolve("notabranch@{7}"));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void resolvePreviousBranch() throws Exception {
|
public void resolvePreviousBranch() throws Exception {
|
||||||
Git git = new Git(db);
|
try (Git git = new Git(db)) {
|
||||||
writeTrashFile("file.txt", "content");
|
writeTrashFile("file.txt", "content");
|
||||||
git.add().addFilepattern("file.txt").call();
|
git.add().addFilepattern("file.txt").call();
|
||||||
RevCommit c1 = git.commit().setMessage("create file").call();
|
RevCommit c1 = git.commit().setMessage("create file").call();
|
||||||
|
@ -159,10 +163,11 @@ public void resolvePreviousBranch() throws Exception {
|
||||||
|
|
||||||
assertEquals(c2.getName(), db.resolve("@{-3}@{0}").getName());
|
assertEquals(c2.getName(), db.resolve("@{-3}@{0}").getName());
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void resolveDate() throws Exception {
|
public void resolveDate() throws Exception {
|
||||||
Git git = new Git(db);
|
try (Git git = new Git(db)) {
|
||||||
writeTrashFile("file.txt", "content");
|
writeTrashFile("file.txt", "content");
|
||||||
git.add().addFilepattern("file.txt").call();
|
git.add().addFilepattern("file.txt").call();
|
||||||
git.commit().setMessage("create file").call();
|
git.commit().setMessage("create file").call();
|
||||||
|
@ -174,3 +179,4 @@ public void resolveDate() throws Exception {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue