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 km...@apache.org on 2007/07/11 04:05:33 UTC
svn commit: r555139 -
/db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeTest.java
Author: kmarsden
Date: Tue Jul 10 19:05:32 2007
New Revision: 555139
URL: http://svn.apache.org/viewvc?view=rev&rev=555139
Log:
DERBY-2893 Fix test errors in GrantRevokeTest
merge from trunk
Modified:
db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeTest.java
Modified: db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeTest.java?view=diff&rev=555139&r1=555138&r2=555139
==============================================================================
--- db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeTest.java (original)
+++ db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeTest.java Tue Jul 10 19:05:32 2007
@@ -167,7 +167,7 @@
assertSelectPrivilege(false, users[4], "s1", "t1", new String[] {"c3"});
assertSelectPrivilege(false, users[4], "s1", "t1", null);
assertUpdatePrivilege(false, users[4], "S1", "T1", new String[] {"C1"});
- assertUpdatePrivilege(false, users[4], "S1", "T1", new String[] {"C2", "C3"});
+ assertUpdatePrivilege(true, users[4], "S1", "T1", new String[] {"C2", "C3"});
assertReferencesPrivilege(true, users[4], "s1", "t1", new String[] {"c1","c2","c3"});
revoke("select(c1),update(c3,c2),references(c3,c1,c2)", "s1", "t1", users[4]);
}
@@ -1045,7 +1045,7 @@
// NOTE - getColumns returns empty result set if schema / table names not capitalized.
// TODO - should implement asserting insert privilege on a subset of columns at some point
- Connection c = openUserConnection(users[0]);
+ Connection c = openUserConnection(user);
Statement s = c.createStatement();
try {
@@ -1063,13 +1063,13 @@
rs.close();
command.append(")");
int i = s.executeUpdate(command.toString());
- // DERBY-2893 INSERT seems to succeed.
- //if (!hasPrivilege)
- // fail("expected no INSERT permission on table");
- } catch (SQLException e) {
+ if (!hasPrivilege)
+ fail("expected no INSERT permission on table");
+
+ } catch (SQLException e) {
if (!hasPrivilege) {
- assertSQLState("42502", e);
+ assertSQLState("42500", e);
} else {
fail("Unexpected lack of insert privilege on " + schema + "." + table + " by " + user);
}
@@ -1130,9 +1130,8 @@
assertEquals(columnCount, actualCount);
}
- // DERBY-2893 UPDATE seems to succeed.
- //if (!hasPrivilege)
- // fail("expected no UPDATE permission on table");
+ if (!hasPrivilege)
+ fail("expected no UPDATE permission on table");
} catch (SQLException e) {
if (!hasPrivilege) {