db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1000779 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby151Test.java
Date Fri, 24 Sep 2010 09:48:40 GMT
Author: kahatlen
Date: Fri Sep 24 09:48:40 2010
New Revision: 1000779

URL: http://svn.apache.org/viewvc?rev=1000779&view=rev
Log:
DERBY-4814: Minor cleanup of Derby151Test

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby151Test.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby151Test.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby151Test.java?rev=1000779&r1=1000778&r2=1000779&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby151Test.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby151Test.java
Fri Sep 24 09:48:40 2010
@@ -21,20 +21,14 @@ package org.apache.derbyTesting.function
 
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
-import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
 import org.apache.derbyTesting.junit.TestConfiguration;
 import org.apache.derbyTesting.junit.JDBC;
 
-import org.apache.derby.shared.common.sanity.SanityManager;
-
-import junit.framework.Assert;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import java.sql.CallableStatement;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
-import java.sql.ResultSet;
 import java.sql.Statement;
 import java.sql.SQLException;
 import java.sql.DriverManager;
@@ -56,15 +50,14 @@ public class Derby151Test extends BaseJD
     {
         TestSuite suite = new TestSuite(name);
 
-        if (!JDBC.vmSupportsJSR169()) {
-            // JSR169 cannot run with tests with stored procedures
-            // that do database access - for they require a
-            // DriverManager connection to jdbc:default:connection;
+        if (JDBC.vmSupportsJDBC3()) {
+            // We need a JDBC level that supports DriverManager in order
+            // to run tests that access the database from a stored procedure
+            // using DriverManager and jdbc:default:connection.
             // DriverManager is not supported with JSR169.
 
             suite.addTestSuite(Derby151Test.class);
-                return new CleanDatabaseTestSetup(
-                    new TestSuite(Derby151Test.class, name));
+            return new CleanDatabaseTestSetup(suite);
         } else {
             return suite;
         }
@@ -129,7 +122,7 @@ public class Derby151Test extends BaseJD
             }
         } finally {
             // always clear flag
-            Thread.currentThread().interrupted();
+            Thread.interrupted();
 
             if (insert != null) {
                 try {



Mime
View raw message