Repository: logging-log4j2 Updated Branches: refs/heads/LOG4J2-1553 5812bb56f -> 370ea6c68
Use try-with-resources. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/3ca829c1 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/3ca829c1 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/3ca829c1 Branch: refs/heads/LOG4J2-1553 Commit: 3ca829c194e68f23da6231e9545c35a923e507d1 Parents: 5812bb5 Author: Gary Gregory <ggreg...@apache.org> Authored: Sun Aug 28 13:42:08 2016 -0700 Committer: Gary Gregory <ggreg...@apache.org> Committed: Sun Aug 28 13:42:08 2016 -0700 ---------------------------------------------------------------------- .../appender/NoSqlDatabaseManagerTest.java | 32 ++++++++------------ 1 file changed, 13 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3ca829c1/log4j-nosql/src/test/java/org/apache/logging/log4j/nosql/appender/NoSqlDatabaseManagerTest.java ---------------------------------------------------------------------- diff --git a/log4j-nosql/src/test/java/org/apache/logging/log4j/nosql/appender/NoSqlDatabaseManagerTest.java b/log4j-nosql/src/test/java/org/apache/logging/log4j/nosql/appender/NoSqlDatabaseManagerTest.java index 8d5b7a0..328ce31 100644 --- a/log4j-nosql/src/test/java/org/apache/logging/log4j/nosql/appender/NoSqlDatabaseManagerTest.java +++ b/log4j-nosql/src/test/java/org/apache/logging/log4j/nosql/appender/NoSqlDatabaseManagerTest.java @@ -73,29 +73,23 @@ public class NoSqlDatabaseManagerTest { } @Test - public void testConnection() { - replay(this.provider, this.connection); + public void testConnection() { + replay(this.provider, this.connection); - final NoSqlDatabaseManager<?> manager = NoSqlDatabaseManager.getNoSqlDatabaseManager("name", 0, this.provider); + try (final NoSqlDatabaseManager<?> manager = NoSqlDatabaseManager.getNoSqlDatabaseManager("name", 0, + this.provider)) { - assertNotNull("The manager should not be null.", manager); + assertNotNull("The manager should not be null.", manager); - try { - verify(this.provider, this.connection); - reset(this.provider, this.connection); - expect(this.provider.getConnection()).andReturn(this.connection); - replay(this.provider, this.connection); + verify(this.provider, this.connection); + reset(this.provider, this.connection); + expect(this.provider.getConnection()).andReturn(this.connection); + replay(this.provider, this.connection); - manager.connectAndStart(); - manager.commitAndClose(); - } finally { - try { - manager.close(); - } catch (final Throwable ignore) { - /* */ - } - } - } + manager.connectAndStart(); + manager.commitAndClose(); + } + } @Test public void testWriteInternalNotConnected01() {
