db-derby-commits mailing list archives

Author: myrnavl
Date: Wed Nov 12 14:21:39 2008
New Revision: 713533

URL: http://svn.apache.org/viewvc?rev=713533&view=rev
Log:
DERBY-3917; skip fixture testCurrentRoleInWeirdContexts and 1 test case in 
  fixture testDefaultCurrentRole in lang.RolesConferredPrivilegesTest with 
  JSR169.
  Patch contributed by Dag H. Wanvik.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RolesConferredPrivilegesTest.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RolesConferredPrivilegesTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RolesConferredPrivilegesTest.java?rev=713533&r1=713532&r2=713533&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RolesConferredPrivilegesTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RolesConferredPrivilegesTest.java
Wed Nov 12 14:21:39 2008
@@ -1410,8 +1410,17 @@
         cStmt.executeUpdate("drop table t");
 
         // do the same from within a stored procedure
+
         s.execute("grant execute on procedure s1.calledNested to DonaldDuck");
-        cStmt.executeUpdate("call s1.calledNested()");
+
+        if (!JDBC.vmSupportsJSR169()) {
+            // JSR169 cannot run with tests with stored procedures
+            // that do database access - for they require a
+            // DriverManager connection to jdbc:default:connection;
+            // DriverManager is not supported with JSR169.
+            cStmt.executeUpdate("call s1.calledNested()");
+        }
+
         setRole(c, "none");
 
         cStmt.close();
@@ -1430,6 +1439,14 @@
      * See DERBY-3897.
      */
     public void testCurrentRoleInWeirdContexts() throws SQLException {
+        if (JDBC.vmSupportsJSR169()) {
+            // JSR169 cannot run with tests with stored procedures
+            // that do database access - for they require a
+            // DriverManager connection to jdbc:default:connection;
+            // DriverManager is not supported with JSR169.
+            return;
+        }
+
         Connection dboConn = getConnection();
         Statement s = dboConn.createStatement();
         setRole(dboConn, "a1");