db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r543343 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi: BlobClob4BlobTest.java LobStreamsTest.java
Date Fri, 01 Jun 2007 00:49:43 GMT
Author: myrnavl
Date: Thu May 31 17:49:42 2007
New Revision: 543343

URL: http://svn.apache.org/viewvc?view=rev&rev=543343
Log:
DERBY-2718 - LobStreamsTest and BlobClob4BlobTest fail with JSR169 because missing support
for encryption. Now, only running encryption part with vms supporting JDBC3 and higher.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobClob4BlobTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/LobStreamsTest.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobClob4BlobTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobClob4BlobTest.java?view=diff&rev=543343&r1=543342&r2=543343
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobClob4BlobTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobClob4BlobTest.java
Thu May 31 17:49:42 2007
@@ -35,6 +35,7 @@
 import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
 import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
 import org.apache.derbyTesting.junit.Decorator;
+import org.apache.derbyTesting.junit.JDBC;
 import org.apache.derbyTesting.junit.Utilities;
 
 import junit.framework.*;
@@ -2752,10 +2753,13 @@
                 TestConfiguration.embeddedSuite(BlobClob4BlobTest.class));
         suite.addTest(
                 TestConfiguration.clientServerSuite(BlobClob4BlobTest.class));
-
-        TestSuite encSuite = new TestSuite ("BlobClob4BlobTest:encrypted");
-        encSuite.addTestSuite (BlobClob4BlobTest.class);
-        suite.addTest(Decorator.encryptedDatabase (encSuite));
+        // JSR169 does not have encryption support
+        if (JDBC.vmSupportsJDBC3())
+        {
+            TestSuite encSuite = new TestSuite ("BlobClob4BlobTest:encrypted");
+            encSuite.addTestSuite (BlobClob4BlobTest.class);
+            suite.addTest(Decorator.encryptedDatabase (encSuite));
+        }
         return new CleanDatabaseTestSetup(
                 DatabasePropertyTestSetup.setLockTimeouts(suite, 2, 4));
     }

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/LobStreamsTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/LobStreamsTest.java?view=diff&rev=543343&r1=543342&r2=543343
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/LobStreamsTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/LobStreamsTest.java
Thu May 31 17:49:42 2007
@@ -38,6 +38,7 @@
 import org.apache.derbyTesting.functionTests.util.streams.LoopingAlphabetStream;
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 import org.apache.derbyTesting.junit.Decorator;
+import org.apache.derbyTesting.junit.JDBC;
 import org.apache.derbyTesting.junit.TestConfiguration;
 
 public class LobStreamsTest extends BaseJDBCTestCase {
@@ -446,9 +447,12 @@
                 
         TestSuite ts  = new TestSuite ("LobStreamsTest");
         ts.addTest(TestConfiguration.defaultSuite (LobStreamsTest.class));
-        TestSuite encSuite = new TestSuite ("LobStreamsTest:encrypted");
-        encSuite.addTestSuite (LobStreamsTest.class);
-        ts.addTest(Decorator.encryptedDatabase (encSuite));
+        // JSR169 does not have support for encryption
+        if (JDBC.vmSupportsJDBC3()) {
+            TestSuite encSuite = new TestSuite ("LobStreamsTest:encrypted");
+            encSuite.addTestSuite (LobStreamsTest.class);
+            ts.addTest(Decorator.encryptedDatabase (encSuite));
+        }
         return ts;
     }
     //method to ensure that buffer is filled if there is any data in stream



Mime
View raw message