Repository: incubator-trafodion Updated Branches: refs/heads/master d344fad28 -> cd89a2a17
TRAFODION-2823 some test case donot close connection Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/47ec5876 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/47ec5876 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/47ec5876 Branch: refs/heads/master Commit: 47ec58764ffaa4381f65c5cf87a909b7f701b2f0 Parents: 4b86c64 Author: gpj1987 <[email protected]> Authored: Thu Nov 30 20:10:37 2017 +0800 Committer: gpj1987 <[email protected]> Committed: Thu Nov 30 20:10:37 2017 +0800 ---------------------------------------------------------------------- .../src/test/java/org/trafodion/jdbc_test/PropTest.java | 4 ++++ .../java/org/trafodion/jdbc_test/TestNetworkTimeout.java | 8 ++++++++ .../src/test/java/org/trafodion/jdbc_test/TestWrap.java | 11 +++++++++++ 3 files changed, 23 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/47ec5876/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/PropTest.java ---------------------------------------------------------------------- diff --git a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/PropTest.java b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/PropTest.java index a4a269e..1838e7b 100644 --- a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/PropTest.java +++ b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/PropTest.java @@ -61,8 +61,12 @@ public class PropTest System.out.println("Catalog : " + conn.getCatalog()); assertEquals("Catalog should be the same as the properties file defined",Utils.catalog, conn.getCatalog()); System.out.println("testDefaultPropertiesConnection : PASS"); + conn.close(); } catch (Exception e) { + if (conn != null) { + conn.close(); + } } } } http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/47ec5876/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestNetworkTimeout.java ---------------------------------------------------------------------- diff --git a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestNetworkTimeout.java b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestNetworkTimeout.java index 14f9f44..5944672 100644 --- a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestNetworkTimeout.java +++ b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestNetworkTimeout.java @@ -55,7 +55,11 @@ public class TestNetworkTimeout { es.shutdown(); int result = conn.getNetworkTimeout(); assertTrue("this is networkTimeout", result == 100); + conn.close(); } catch (SQLException e) { + if (conn != null) { + conn.close(); + } e.printStackTrace(); } } @@ -67,7 +71,11 @@ public class TestNetworkTimeout { conn = Utils.getUserConnection(); int result = conn.getNetworkTimeout(); assertTrue("this is networkTimeout", result == 0); + conn.close(); } catch (SQLException e) { + if (conn != null) { + conn.close(); + } e.printStackTrace(); } } http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/47ec5876/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestWrap.java ---------------------------------------------------------------------- diff --git a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestWrap.java b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestWrap.java index 4716f97..1a798f5 100644 --- a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestWrap.java +++ b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestWrap.java @@ -51,7 +51,11 @@ public class TestWrap { conn = Utils.getUserConnection(); boolean result = conn.isWrapperFor(Connection.class); assertTrue("It is wrapper for this interface", result); + conn.close(); } catch (SQLException e) { + if (conn !=null) { + conn.close(); + } e.printStackTrace(); } } @@ -64,6 +68,9 @@ public class TestWrap { conn = Utils.getUserConnection(); conn.close(); } catch (SQLException e) { + if (conn !=null) { + conn.close(); + } e.printStackTrace(); } conn.isWrapperFor(Connection.class) ; @@ -79,7 +86,11 @@ public class TestWrap { assertTrue("It is unwrape for this interface", result); result = conn.unwrap(Connection.class) instanceof TestWrap; assertTrue("It is unwrape for this interface", !result); + conn.close(); } catch (SQLException e) { + if (conn !=null) { + conn.close(); + } e.printStackTrace(); } }
