From 7b393ac6f19a46e046938ea958ec7c8b4bb3a337 Mon Sep 17 00:00:00 2001 From: Brett Wooldridge Date: Thu, 9 Apr 2015 23:08:25 +0900 Subject: [PATCH] More teImprove test coverage. --- src/main/java/com/zaxxer/hikari/proxy/ClosedConnection.java | 5 +---- src/test/java/com/zaxxer/hikari/TestConnections.java | 5 +++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zaxxer/hikari/proxy/ClosedConnection.java b/src/main/java/com/zaxxer/hikari/proxy/ClosedConnection.java index 0be77866..6a268082 100644 --- a/src/main/java/com/zaxxer/hikari/proxy/ClosedConnection.java +++ b/src/main/java/com/zaxxer/hikari/proxy/ClosedConnection.java @@ -38,10 +38,7 @@ final class ClosedConnection public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { final String methodName = method.getName(); - if ("isClosed".equals(methodName)) { - return Boolean.TRUE; - } - else if ("close".equals(methodName)) { + if ("close".equals(methodName)) { return Void.TYPE; } else if ("abort".equals(methodName)) { diff --git a/src/test/java/com/zaxxer/hikari/TestConnections.java b/src/test/java/com/zaxxer/hikari/TestConnections.java index 8910ccd6..82bd64dc 100644 --- a/src/test/java/com/zaxxer/hikari/TestConnections.java +++ b/src/test/java/com/zaxxer/hikari/TestConnections.java @@ -203,7 +203,12 @@ public class TestConnections try { Connection connection = ds.getConnection(); connection.close(); + + // should no-op + connection.abort(null); + Assert.assertTrue("Connection should have closed", connection.isClosed()); + Assert.assertFalse("Connection should have closed", connection.isValid(5)); Assert.assertTrue("Expected to contain ClosedConnection, but was " + connection.toString(), connection.toString().contains("ClosedConnection")); connection.close();