You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2017/12/18 17:13:50 UTC
[1/4] incubator-trafodion git commit: TRAFODION-2823 some test case
donot close connection
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 <gp...@gmail.com>
Authored: Thu Nov 30 20:10:37 2017 +0800
Committer: gpj1987 <gp...@gmail.com>
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();
}
}
[3/4] incubator-trafodion git commit: modify the error typo
Posted by db...@apache.org.
modify the error typo
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/0bb625b0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/0bb625b0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/0bb625b0
Branch: refs/heads/master
Commit: 0bb625b04f050bdbc24c434ccfde3124ccef97a6
Parents: d795029
Author: gpj1987 <gp...@gmail.com>
Authored: Fri Dec 15 17:16:00 2017 +0800
Committer: gpj1987 <gp...@gmail.com>
Committed: Fri Dec 15 17:16:00 2017 +0800
----------------------------------------------------------------------
.../src/test/java/org/trafodion/jdbc_test/TestNetworkTimeout.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0bb625b0/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 7e01a72..e8f6cb1 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
@@ -72,7 +72,7 @@ public class TestNetworkTimeout {
Connection conn = null;
try {
System.out.println("Connecting to database...");
- conn = Utils.getUserConnection();S
+ conn = Utils.getUserConnection();
int result = conn.getNetworkTimeout();
assertTrue("this is networkTimeout", result == 0);
conn.close();
[4/4] incubator-trafodion git commit: Merge [TRAFODION-2823] PR 1320
Fix test cases that don't close connections
Posted by db...@apache.org.
Merge [TRAFODION-2823] PR 1320 Fix test cases that don't close connections
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/cd89a2a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/cd89a2a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/cd89a2a1
Branch: refs/heads/master
Commit: cd89a2a17b7a15200463d6762f1826acb9b2ef97
Parents: d344fad 0bb625b
Author: Dave Birdsall <db...@apache.org>
Authored: Mon Dec 18 17:13:00 2017 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Mon Dec 18 17:13:00 2017 +0000
----------------------------------------------------------------------
.../java/org/trafodion/jdbc_test/PropTest.java | 8 +++++++
.../trafodion/jdbc_test/TestNetworkTimeout.java | 17 +++++++++++++++
.../java/org/trafodion/jdbc_test/TestWrap.java | 23 ++++++++++++++++++++
3 files changed, 48 insertions(+)
----------------------------------------------------------------------
[2/4] incubator-trafodion git commit: add try catch
Posted by db...@apache.org.
add try catch
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/d7950296
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/d7950296
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/d7950296
Branch: refs/heads/master
Commit: d7950296945ec26f10aadb976556f4cedfaf6fda
Parents: 47ec587
Author: gpj1987 <gp...@gmail.com>
Authored: Mon Dec 11 16:24:13 2017 +0800
Committer: gpj1987 <gp...@gmail.com>
Committed: Mon Dec 11 16:24:13 2017 +0800
----------------------------------------------------------------------
.../java/org/trafodion/jdbc_test/PropTest.java | 6 ++++-
.../trafodion/jdbc_test/TestNetworkTimeout.java | 23 +++++++++++++------
.../java/org/trafodion/jdbc_test/TestWrap.java | 24 +++++++++++++++-----
3 files changed, 39 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d7950296/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 1838e7b..e802949 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
@@ -65,7 +65,11 @@ public class PropTest
}
catch (Exception e) {
if (conn != null) {
- conn.close();
+ try {
+ conn.close();
+ } catch (SQLException e1) {
+ e1.printStackTrace();
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d7950296/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 5944672..7e01a72 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
@@ -57,9 +57,13 @@ public class TestNetworkTimeout {
assertTrue("this is networkTimeout", result == 100);
conn.close();
} catch (SQLException e) {
- if (conn != null) {
- conn.close();
- }
+ if (conn != null) {
+ try {
+ conn.close();
+ } catch (SQLException e1) {
+ e1.printStackTrace();
+ }
+ }
e.printStackTrace();
}
}
@@ -68,14 +72,19 @@ public class TestNetworkTimeout {
Connection conn = null;
try {
System.out.println("Connecting to database...");
- conn = Utils.getUserConnection();
+ conn = Utils.getUserConnection();S
int result = conn.getNetworkTimeout();
assertTrue("this is networkTimeout", result == 0);
conn.close();
} catch (SQLException e) {
- if (conn != null) {
- conn.close();
- }
+ if (conn != null) {
+ try {
+ conn.close();
+ } catch (SQLException e1) {
+ e1.printStackTrace();
+ }
+ }
+
e.printStackTrace();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d7950296/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 1a798f5..fe10e1b 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
@@ -53,8 +53,12 @@ public class TestWrap {
assertTrue("It is wrapper for this interface", result);
conn.close();
} catch (SQLException e) {
- if (conn !=null) {
- conn.close();
+ if (conn != null) {
+ try {
+ conn.close();
+ } catch (SQLException e1) {
+ e1.printStackTrace();
+ }
}
e.printStackTrace();
}
@@ -68,8 +72,12 @@ public class TestWrap {
conn = Utils.getUserConnection();
conn.close();
} catch (SQLException e) {
- if (conn !=null) {
- conn.close();
+ if (conn != null) {
+ try {
+ conn.close();
+ } catch (SQLException e1) {
+ e1.printStackTrace();
+ }
}
e.printStackTrace();
}
@@ -88,8 +96,12 @@ public class TestWrap {
assertTrue("It is unwrape for this interface", !result);
conn.close();
} catch (SQLException e) {
- if (conn !=null) {
- conn.close();
+ if (conn != null) {
+ try {
+ conn.close();
+ } catch (SQLException e1) {
+ e1.printStackTrace();
+ }
}
e.printStackTrace();
}