From d882bf8c4de91e5fc35379ab8731d7ad15d21369 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Fri, 5 Feb 2016 17:05:05 +0900 Subject: [PATCH] SquashMessageFormatterTest: Open git in try-with-resource Change-Id: Ife94d1f0279ed3671a9bca79fb26c0403549fa17 Signed-off-by: David Pursehouse --- .../merge/SquashMessageFormatterTest.java | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/SquashMessageFormatterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/SquashMessageFormatterTest.java index cddbbd528..7a2586dca 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/SquashMessageFormatterTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/SquashMessageFormatterTest.java @@ -73,17 +73,18 @@ public void setUp() throws Exception { @Test public void testCommit() throws Exception { - Git git = new Git(db); - revCommit = git.commit().setMessage("squash_me").call(); + try (Git git = new Git(db)) { + revCommit = git.commit().setMessage("squash_me").call(); - Ref master = db.exactRef("refs/heads/master"); - String message = msgFormatter.format(Arrays.asList(revCommit), master); - assertEquals( - "Squashed commit of the following:\n\ncommit " - + revCommit.getName() + "\nAuthor: " - + revCommit.getAuthorIdent().getName() + " <" - + revCommit.getAuthorIdent().getEmailAddress() - + ">\nDate: " + dateFormatter.formatDate(author) - + "\n\n\tsquash_me\n", message); + Ref master = db.exactRef("refs/heads/master"); + String message = msgFormatter.format(Arrays.asList(revCommit), master); + assertEquals( + "Squashed commit of the following:\n\ncommit " + + revCommit.getName() + "\nAuthor: " + + revCommit.getAuthorIdent().getName() + " <" + + revCommit.getAuthorIdent().getEmailAddress() + + ">\nDate: " + dateFormatter.formatDate(author) + + "\n\n\tsquash_me\n", message); + } } }