db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r534198 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang: GrantRevokeDDLTest.java _Suite.java grantRevokeDDL_app.properties grantRevokeDDL_sed.properties
Date Tue, 01 May 2007 18:54:58 GMT
Author: myrnavl
Date: Tue May  1 11:54:57 2007
New Revision: 534198

URL: http://svn.apache.org/viewvc?view=rev&rev=534198
Log:
DERBY-2525: cleanup 2 no longer needed files, and prevent test from running with JSR169.

Removed:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/grantRevokeDDL_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/grantRevokeDDL_sed.properties
Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeDDLTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeDDLTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeDDLTest.java?view=diff&rev=534198&r1=534197&r2=534198
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeDDLTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeDDLTest.java
Tue May  1 11:54:57 2007
@@ -58,6 +58,9 @@
 
     public static Test suite()
     {
+        if (JDBC.vmSupportsJSR169())
+            return new TestSuite("GrantRevokeDDLTest"); // return empty suite;
+                //test uses triggers and procedures that use DriverManager.
         TestSuite suite = new TestSuite(GrantRevokeDDLTest.class, "GrantRevokeDDL Test");
 	    Test test = new SupportFilesSetup(suite);
 	    test = new CleanDatabaseTestSetup(test);

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java?view=diff&rev=534198&r1=534197&r2=534198
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
Tue May  1 11:54:57 2007
@@ -104,7 +104,6 @@
         suite.addTest(ReleaseCompileLocksTest.suite());
         suite.addTest(ErrorCodeTest.suite());
         suite.addTest(TimestampArithTest.suite());
-        suite.addTest(GrantRevokeDDLTest.suite());
 
 
         // Add the XML tests, which exist as a separate suite
@@ -127,6 +126,17 @@
 		}
         suite.addTest(ResultSetsFromPreparedStatementTest.suite());
 
-		return suite;
+        // tests that do not run with JSR169
+        if (JDBC.vmSupportsJDBC3())  
+        {
+            // test uses triggers interwoven with other tasks
+            // triggers may cause a generated class which calls 
+            // java.sql.DriverManager, which will fail with JSR169.
+            // also, test calls procedures which use DriverManager
+            // to get the default connection.
+            suite.addTest(GrantRevokeDDLTest.suite());
+        }
+
+        return suite;
 	}
 }



Mime
View raw message