motiejus
/
jgit
1
Fork 0
Code Releases Activity

RefUpdateTest: Use try-with-resource for auto-closable types 

Change-Id: I25c8db0e410aa2a4a53dc7d8863e4a6efefcf7cb
Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
This commit is contained in:
David Pursehouse 2016-01-14 15:09:20 +09:00
parent 56634de0cc
commit 0352276da7
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefUpdateTest.java
View File

@ -558,13 +558,15 @@ public void testUpdateRefForwardWithCheck2() throws IOException {
assertEquals(ppid, db.resolve("refs/heads/master"));
// real test
RevCommit old = new RevWalk(db).parseCommit(ppid);
RefUpdate updateRef2 = db.updateRef("refs/heads/master");
updateRef2.setExpectedOldObjectId(old);
updateRef2.setNewObjectId(pid);
Result update2 = updateRef2.update();
assertEquals(Result.FAST_FORWARD, update2);
assertEquals(pid, db.resolve("refs/heads/master"));
try (RevWalk rw = new RevWalk(db)) {
RevCommit old = rw.parseCommit(ppid);
RefUpdate updateRef2 = db.updateRef("refs/heads/master");
updateRef2.setExpectedOldObjectId(old);
updateRef2.setNewObjectId(pid);
Result update2 = updateRef2.update();
assertEquals(Result.FAST_FORWARD, update2);
assertEquals(pid, db.resolve("refs/heads/master"));
}
}
/**
@ -707,9 +709,10 @@ public void testRenameBranchAlsoInPack() throws IOException {
// Create new Repository instance, to reread caches and make sure our
// assumptions are persistent.
Repository ndb = new FileRepository(db.getDirectory());
assertEquals(rb2, ndb.resolve("refs/heads/new/name"));
assertNull(ndb.resolve("refs/heads/b"));
try (Repository ndb = new FileRepository(db.getDirectory())) {
assertEquals(rb2, ndb.resolve("refs/heads/new/name"));
assertNull(ndb.resolve("refs/heads/b"));
}
}
public void tryRenameWhenLocked(String toLock, String fromName,