From 2b94edf427e4a8bc2446cc59eb721f97c83f394a Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Fri, 4 Jun 2010 09:39:47 +0000 Subject: QPID-2632 : Applied patch from Andrew Kennedy. To convert RST and PPT to QTCs not IBBCs git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@951341 13f79535-47bb-0310-9956-ffa450edef68 --- .../server/security/access/PrincipalPermissionsTest.java | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'java/broker-plugins/simple-xml/src/test') diff --git a/java/broker-plugins/simple-xml/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java b/java/broker-plugins/simple-xml/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java index 055dee06a0..65ab12a095 100644 --- a/java/broker-plugins/simple-xml/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java +++ b/java/broker-plugins/simple-xml/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java @@ -18,24 +18,16 @@ * under the License. * */ - package org.apache.qpid.server.security.access; -import junit.framework.TestCase; - import org.apache.qpid.AMQException; import org.apache.qpid.framing.AMQShortString; -import org.apache.qpid.framing.FieldTable; -import org.apache.qpid.server.exchange.DirectExchange; -import org.apache.qpid.server.queue.AMQQueueFactory; -import org.apache.qpid.server.registry.ApplicationRegistry; import org.apache.qpid.server.security.Result; import org.apache.qpid.server.security.access.config.PrincipalPermissions; import org.apache.qpid.server.security.access.config.PrincipalPermissions.Permission; -import org.apache.qpid.server.virtualhost.VirtualHost; -import org.apache.qpid.server.util.InternalBrokerBaseCase; +import org.apache.qpid.test.utils.QpidTestCase; -public class PrincipalPermissionsTest extends InternalBrokerBaseCase +public class PrincipalPermissionsTest extends QpidTestCase { private String _user = "user"; private PrincipalPermissions _perms; @@ -120,10 +112,8 @@ public class PrincipalPermissionsTest extends InternalBrokerBaseCase public void testPublish() throws AMQException { - DirectExchange exchange = DirectExchange.TYPE.newInstance(_virtualHost, _exchangeName, false, 1, _autoDelete); - String[] authArgs = new String[]{_exchangeName.asString(), _routingKey.asString()}; - Object[] grantArgs = new Object[]{exchange.getNameShortString(), _routingKey}; + Object[] grantArgs = new Object[]{_exchangeName, _routingKey}; assertEquals(Result.DENIED, _perms.authorise(Permission.PUBLISH, authArgs)); _perms.grant(Permission.PUBLISH, grantArgs); -- cgit v1.2.1