db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r542016 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4: BlobTest.java CallableStatementTest.java ClobTest.java DataSourceTest.java PreparedStatementTest.java ResultSetTest.java TestJDBC40Exception.java
Date Sun, 27 May 2007 18:30:46 GMT
Author: kahatlen
Date: Sun May 27 11:30:45 2007
New Revision: 542016

URL: http://svn.apache.org/viewvc?view=rev&rev=542016
Log:
DERBY-2707: Inadequate clean-up in many jdbc4 tests

Fixed the tearDown() methods in many of the jdbc4 tests.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/BlobTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/CallableStatementTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ClobTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/DataSourceTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/PreparedStatementTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ResultSetTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestJDBC40Exception.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/BlobTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/BlobTest.java?view=diff&rev=542016&r1=542015&r2=542016
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/BlobTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/BlobTest.java
Sun May 27 11:30:45 2007
@@ -125,7 +125,7 @@
     //throwing a SQLException when they are called after calling free()
     //on a LOB.
     
-    private ExemptBlobMD [] emd = new ExemptBlobMD [] {
+    private static final ExemptBlobMD [] emd = new ExemptBlobMD [] {
         new ExemptBlobMD( "getBinaryStream", new Class[] { long.class,long.class }
                                                                    ,true,true ),
         new ExemptBlobMD( "setBinaryStream", new Class[] { long.class },false,true ),
@@ -167,6 +167,13 @@
         //from throwing a SQLException after free has been called
         //on the Clob object.
         buildHashSet();
+    }
+
+    protected void tearDown() throws Exception {
+        blob.free();
+        blob = null;
+        excludedMethodSet = null;
+        super.tearDown();
     }
     
     /**

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/CallableStatementTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/CallableStatementTest.java?view=diff&rev=542016&r1=542015&r2=542016
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/CallableStatementTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/CallableStatementTest.java
Sun May 27 11:30:45 2007
@@ -71,9 +71,9 @@
      */
     protected void tearDown()
         throws Exception {
-        if (cStmt != null && !cStmt.isClosed()) {
-            cStmt.close();
-        }
+
+        cStmt.close();
+        cStmt = null;
 
         super.tearDown();
     }
@@ -83,7 +83,6 @@
         DatabaseMetaData met = getConnection().getMetaData();
         assertFalse("Named parameters are not supported, but the metadata " +
                     "says they are", met.supportsNamedParameters());
-        met = null;
     }
     
     public void testGetDoubleIntOnInParameter()

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ClobTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ClobTest.java?view=diff&rev=542016&r1=542015&r2=542016
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ClobTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ClobTest.java
Sun May 27 11:30:45 2007
@@ -126,7 +126,7 @@
     //throwing a SQLException when they are called after calling free()
     //on a LOB.
     
-    private ExemptClobMD [] emd = new ExemptClobMD [] {
+    private static final ExemptClobMD [] emd = new ExemptClobMD [] {
         new ExemptClobMD( "getCharacterStream", new Class[] { long.class, long.class } ,true,true),
         new ExemptClobMD( "setAsciiStream",     new Class[] { long.class } ,false,true),
 	new ExemptClobMD( "setCharacterStream", new Class[] { long.class } ,true,true),
@@ -161,6 +161,13 @@
         //from throwing a SQLException after free has been called
         //on the Clob object.
         buildHashSet();
+    }
+
+    protected void tearDown() throws Exception {
+        clob.free();
+        clob = null;
+        excludedMethodSet = null;
+        super.tearDown();
     }
     
     /**

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/DataSourceTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/DataSourceTest.java?view=diff&rev=542016&r1=542015&r2=542016
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/DataSourceTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/DataSourceTest.java
Sun May 27 11:30:45 2007
@@ -62,8 +62,9 @@
      * Initialize the ds to null once the tests that need to be run have been 
      * run
      */
-    public void tearDown() {
+    public void tearDown() throws Exception {
         ds = null;
+        super.tearDown();
     }
 
     public void testIsWrapperForDataSource() throws SQLException {

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/PreparedStatementTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/PreparedStatementTest.java?view=diff&rev=542016&r1=542015&r2=542016
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/PreparedStatementTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/PreparedStatementTest.java
Sun May 27 11:30:45 2007
@@ -144,12 +144,21 @@
         s.close();
         ps.close();
 
+        s = null;
+        ps = null;
+
         psFetchBlob.close();
         psFetchClob.close();
         psInsertBlob.close();
         psInsertClob.close();
         psInsertLongVarchar.close();
         
+        psFetchBlob = null;
+        psFetchClob = null;
+        psInsertBlob = null;
+        psInsertClob = null;
+        psInsertLongVarchar = null;
+
         super.tearDown();
     }
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ResultSetTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ResultSetTest.java?view=diff&rev=542016&r1=542015&r2=542016
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ResultSetTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ResultSetTest.java
Sun May 27 11:30:45 2007
@@ -94,12 +94,11 @@
     protected void tearDown()
         throws Exception {
 
-        if (rs != null) {
-            rs.close();
-        }
-        if (stmt != null) {
-            stmt.close();
-        }
+        rs.close(); 
+        stmt.close();
+
+        rs = null;
+        stmt = null;
 
         super.tearDown();
     }

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestJDBC40Exception.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestJDBC40Exception.java?view=diff&rev=542016&r1=542015&r2=542016
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestJDBC40Exception.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestJDBC40Exception.java
Sun May 27 11:30:45 2007
@@ -56,7 +56,10 @@
     }
 
     protected void tearDown() throws Exception {
-        createStatement().execute("drop table EXCEPTION_TABLE1");
+        Statement s = createStatement();
+        s.execute("drop table EXCEPTION_TABLE1");
+        s.close();
+        commit();
         super.tearDown();
     }
 



Mime
View raw message