Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pursehouse2016-01-14 06:09:20 +0000
committerDavid Pursehouse2016-01-14 06:09:53 +0000
commit0352276da7790667cd32e55f64386f742b42cd16 (patch)
treea98d14fe4bf27b7c34abe2119d8637ac7cfef2d2 /org.eclipse.jgit.test
parent56634de0cc3b0fd0d66bd867210e7e2d74451cea (diff)
downloadjgit-0352276da7790667cd32e55f64386f742b42cd16.tar.gz
jgit-0352276da7790667cd32e55f64386f742b42cd16.tar.xz
jgit-0352276da7790667cd32e55f64386f742b42cd16.zip
RefUpdateTest: Use try-with-resource for auto-closable types
Change-Id: I25c8db0e410aa2a4a53dc7d8863e4a6efefcf7cb Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
Diffstat (limited to 'org.eclipse.jgit.test')
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefUpdateTest.java23
1 files changed, 13 insertions, 10 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefUpdateTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefUpdateTest.java
index 4ae92ccbe2..48434189e4 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefUpdateTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefUpdateTest.java
@@ -558,13 +558,15 @@ public class RefUpdateTest extends SampleDataRepositoryTestCase {
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 class RefUpdateTest extends SampleDataRepositoryTestCase {
// 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,

Back to the top