svn commit: r521422 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/_Suite.java

[my...@apache.org]

Author: myrnavl
Date: Thu Mar 22 12:51:30 2007
New Revision: 521422

URL: http://svn.apache.org/viewvc?view=rev&rev=521422
Log:
DERBY-1496: preventing NSSecurityMechanismTest to be loaded with JSR169 - it imports javax.sql.ConnectionPoolDataSource which isn't available with JSR169.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/_Suite.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/_Suite.java?view=diff&rev=521422&r1=521421&r2=521422
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/_Suite.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/_Suite.java Thu Mar 22 12:51:30 2007
@@ -23,6 +23,7 @@
 
 import org.apache.derbyTesting.junit.BaseTestCase;
 import org.apache.derbyTesting.junit.Derby;
+import org.apache.derbyTesting.junit.JDBC;
 
 import junit.framework.Test; 
 import junit.framework.TestSuite;
@@ -53,7 +54,13 @@
         suite.addTest(BadConnectionTest.suite());
         suite.addTest(NetHarnessJavaTest.suite());
         suite.addTest(SecureServerTest.suite());
-        suite.addTest(NSSecurityMechanismTest.suite());
+        
+        // this test refers to ConnectionPooledDataSource class
+        // thus causing class not found exceptions with JSR169
+        if (JDBC.vmSupportsJDBC3())
+        {
+            suite.addTest(NSSecurityMechanismTest.suite());
+        }
         
         // These tests references a client class directly
         // thus causing class not found exceptions if the