You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by my...@apache.org on 2007/05/09 19:41:35 UTC

svn commit: r536598 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests: jdbcapi/BlobStoredProcedureTest.java jdbcapi/ClobStoredProcedureTest.java upgradeTests/Changes10_3.java

Author: myrnavl
Date: Wed May  9 10:41:34 2007
New Revision: 536598

URL: http://svn.apache.org/viewvc?view=rev&rev=536598
Log:
DERBY-2632 - attempt to fix some failing upgrade tests with JSR169 by preventing them from running.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobStoredProcedureTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobStoredProcedureTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_3.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobStoredProcedureTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobStoredProcedureTest.java?view=diff&rev=536598&r1=536597&r2=536598
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobStoredProcedureTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobStoredProcedureTest.java Wed May  9 10:41:34 2007
@@ -63,7 +63,7 @@
      */
     public static Test suite() {
         if (JDBC.vmSupportsJSR169()) {
-            return new TestSuite("empty: client not supported on JSR169");
+            return new TestSuite("empty: client not supported on JSR169; procs use DriverMgr");
         }
         else {
             return TestConfiguration.defaultSuite(

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobStoredProcedureTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobStoredProcedureTest.java?view=diff&rev=536598&r1=536597&r2=536598
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobStoredProcedureTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobStoredProcedureTest.java Wed May  9 10:41:34 2007
@@ -56,7 +56,7 @@
      */
     public static Test suite() {
         if (JDBC.vmSupportsJSR169()) {
-            return new TestSuite("empty: client not supported on JSR169");
+            return new TestSuite("empty: client not supported on JSR169; procs use DriverMgr");
         }
         else {
             return TestConfiguration.defaultSuite(

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_3.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_3.java?view=diff&rev=536598&r1=536597&r2=536598
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_3.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_3.java Wed May  9 10:41:34 2007
@@ -63,10 +63,13 @@
         //implementation of the LOB related JDBC methods. This needs to be done
         //only during the hard(full) upgrade phase.
         if(phase == PH_HARD_UPGRADE) {
-            //Tests for the Blob related locator StoredProcedures
-            suite.addTestSuite(BlobStoredProcedureTest.class);
-            //Tests for the Clob related locator StoredProcedures
-            suite.addTestSuite(ClobStoredProcedureTest.class);
+            if (JDBC.vmSupportsJDBC3())
+            {
+                //Tests for the Blob related locator StoredProcedures
+                suite.addTestSuite(BlobStoredProcedureTest.class);
+                //Tests for the Clob related locator StoredProcedures
+                suite.addTestSuite(ClobStoredProcedureTest.class);
+            }
         }
         
         return new SupportFilesSetup((Test) suite);