db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r441789 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: suites/DerbyNet.exclude suites/jdbcapi.runall tests/jdbcapi/UpdatableResultSetTest.java tests/jdbcapi/_Suite.java
Date Sat, 09 Sep 2006 14:38:55 GMT
Author: kahatlen
Date: Sat Sep  9 07:38:54 2006
New Revision: 441789

URL: http://svn.apache.org/viewvc?view=rev&rev=441789
Log:
DERBY-1767: Made UpdatableResultSetTest run as part of _Suite.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbcapi.runall
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/UpdatableResultSetTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude?view=diff&rev=441789&r1=441788&r2=441789
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude
Sat Sep  9 07:38:54 2006
@@ -15,7 +15,6 @@
 #           regardless of framework
 # excluding largedata/LobLimits.java to run with the network server because currently lobs
are materialized and this test tests for 2G lobs.
 # 			see DERBY-326 and DERBY-550 issues
-# excluding jdbcapi/UpdatableResultSetTest.java - Test fails with JCC
 jdbcapi/resultsetStream.java
 lang/errorStream.java
 lang/scrollCursors2.java
@@ -46,4 +45,3 @@
 # DERBY-1691: when run against JCC, exceptions in blobclob4BLOB can appear in
 # different places in the output.
 jdbcapi/blobclob4BLOB.java
-jdbcapi/UpdatableResultSetTest.junit

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbcapi.runall
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbcapi.runall?view=diff&rev=441789&r1=441788&r2=441789
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbcapi.runall
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbcapi.runall
Sat Sep  9 07:38:54 2006
@@ -22,4 +22,3 @@
 jdbcapi/Stream.java
 jdbcapi/SURTest_ij.sql
 jdbcapi/_Suite.junit
-jdbcapi/UpdatableResultSetTest.junit

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/UpdatableResultSetTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/UpdatableResultSetTest.java?view=diff&rev=441789&r1=441788&r2=441789
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/UpdatableResultSetTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/UpdatableResultSetTest.java
Sat Sep  9 07:38:54 2006
@@ -77,6 +77,18 @@
         conn.close();
     }
     
+    /** Create a test suite with all tests in this class. */
+    public static Test suite() {
+        TestSuite ts = new TestSuite();
+
+        // Test will fail with JCC.
+        if (usingDerbyNet()) {
+            return ts;
+        }
+
+        ts.addTestSuite(UpdatableResultSetTest.class);
+        return ts;
+    }
     
     /**
      * Tests insertRow with table name containing quotes

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java?view=diff&rev=441789&r1=441788&r2=441789
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java
Sat Sep  9 07:38:54 2006
@@ -52,6 +52,7 @@
 		suite.addTest(ProcedureTest.suite());
 		suite.addTest(SURQueryMixTest.suite());
 		suite.addTest(SURTest.suite());
+		suite.addTest(UpdatableResultSetTest.suite());
 		suite.addTest(UpdateXXXTest.suite());
 		suite.addTestSuite(URCoveringIndexTest.class);
         suite.addTest(ResultSetCloseTest.suite());



Mime
View raw message