summaryrefslogtreecommitdiff
path: root/qpid/java/broker-plugins/access-control/src/test
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2014-02-20 15:46:29 +0000
committerRobert Godfrey <rgodfrey@apache.org>2014-02-20 15:46:29 +0000
commit608a0bb1b83fd2920dbc19dc2be399b27c62c1ba (patch)
tree72ce7b1d63c8d358aaa82d321b62caf56bccd298 /qpid/java/broker-plugins/access-control/src/test
parente9f5602cdf5b100a348a2f95c620805ffab803b9 (diff)
downloadqpid-python-608a0bb1b83fd2920dbc19dc2be399b27c62c1ba.tar.gz
QPID-5567 : Further changes to SecurityMangager
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1570239 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins/access-control/src/test')
-rw-r--r--qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlTest.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlTest.java b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlTest.java
index 8ac4e0c424..e907a88001 100644
--- a/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlTest.java
+++ b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlTest.java
@@ -246,7 +246,7 @@ public class DefaultAccessControlTest extends TestCase
DefaultAccessControl accessControl = new DefaultAccessControl(mockRuleSet);
- accessControl.access(ObjectType.VIRTUALHOST);
+ accessControl.authorise(Operation.ACCESS, ObjectType.VIRTUALHOST, ObjectProperties.EMPTY);
verify(mockRuleSet).check(subject, Operation.ACCESS, ObjectType.VIRTUALHOST, ObjectProperties.EMPTY, inetAddress);
return null;
@@ -282,7 +282,7 @@ public class DefaultAccessControlTest extends TestCase
inetAddress)).thenThrow(new RuntimeException());
DefaultAccessControl accessControl = new DefaultAccessControl(mockRuleSet);
- Result result = accessControl.access(ObjectType.VIRTUALHOST);
+ Result result = accessControl.authorise(Operation.ACCESS, ObjectType.VIRTUALHOST, ObjectProperties.EMPTY);
assertEquals(Result.DENIED, result);
return null;