diff options
Diffstat (limited to 'qpid/java/broker-plugins/simple-xml')
| -rw-r--r-- | qpid/java/broker-plugins/simple-xml/build.xml | 2 | ||||
| -rw-r--r-- | qpid/java/broker-plugins/simple-xml/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java | 16 |
2 files changed, 4 insertions, 14 deletions
diff --git a/qpid/java/broker-plugins/simple-xml/build.xml b/qpid/java/broker-plugins/simple-xml/build.xml index 8780bc42b7..d3cd451648 100644 --- a/qpid/java/broker-plugins/simple-xml/build.xml +++ b/qpid/java/broker-plugins/simple-xml/build.xml @@ -18,7 +18,7 @@ --> <project name="Qpid Broker-Plugins Simple XML" default="build"> <property name="module.depends" value="common broker broker-plugins" /> - <property name="module.test.depends" value="test broker/test common/test management/common" /> + <property name="module.test.depends" value="test broker/test common/test management/common systests" /> <property name="module.manifest" value="MANIFEST.MF" /> <property name="module.plugin" value="true" /> diff --git a/qpid/java/broker-plugins/simple-xml/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java b/qpid/java/broker-plugins/simple-xml/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java index 055dee06a0..65ab12a095 100644 --- a/qpid/java/broker-plugins/simple-xml/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java +++ b/qpid/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); |