From 0352276da7790667cd32e55f64386f742b42cd16 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 14 Jan 2016 15:09:20 +0900 Subject: [PATCH] RefUpdateTest: Use try-with-resource for auto-closable types Change-Id: I25c8db0e410aa2a4a53dc7d8863e4a6efefcf7cb Signed-off-by: David Pursehouse --- .../internal/storage/file/RefUpdateTest.java | 23 +++++++++++-------- 1 file 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 4ae92ccbe..48434189e 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 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,