You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2010/06/03 23:28:03 UTC
svn commit: r951160 -
/qpid/trunk/qpid/java/broker-plugins/simple-xml/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java
Author: ritchiem
Date: Thu Jun 3 21:28:03 2010
New Revision: 951160
URL: http://svn.apache.org/viewvc?rev=951160&view=rev
Log:
QPID-2632 : Encorporated changes from Andrew Kennedy, cleanup PPT and extend IBBC as this is a broker unit test.
Modified:
qpid/trunk/qpid/java/broker-plugins/simple-xml/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java
Modified: qpid/trunk/qpid/java/broker-plugins/simple-xml/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/simple-xml/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java?rev=951160&r1=951159&r2=951160&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/simple-xml/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/simple-xml/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java Thu Jun 3 21:28:03 2010
@@ -23,6 +23,7 @@ package org.apache.qpid.server.security.
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;
@@ -44,13 +45,8 @@ public class PrincipalPermissionsTest ex
private AMQShortString _tempQueueName = new AMQShortString(this.getClass().getName() + "tempqueue");
private AMQShortString _exchangeName = new AMQShortString("amq.direct");
private AMQShortString _routingKey = new AMQShortString(this.getClass().getName() + "route");
- private int _ticket = 1;
- private FieldTable _arguments = null;
- private boolean _durable = false;
private boolean _autoDelete = false;
private AMQShortString _exchangeType = new AMQShortString("direct");
- private DirectExchange _exchange;
- private AMQShortString _owner = new AMQShortString(this.getClass().getName() + "owner");
private Boolean _temporary = false;
private Boolean _ownQueue = false;
@@ -60,16 +56,6 @@ public class PrincipalPermissionsTest ex
super.setUp();
_perms = new PrincipalPermissions(_user);
- try
- {
- _exchange = DirectExchange.TYPE.newInstance(_virtualHost, _exchangeName, _durable, _ticket, _autoDelete);
- AMQQueueFactory.createAMQQueueImpl(_queueName, false, _owner , false, false, _virtualHost, _arguments);
- AMQQueueFactory.createAMQQueueImpl(_tempQueueName, false, _owner , true, false, _virtualHost, _arguments);
- }
- catch (Exception e)
- {
- fail(e.getMessage());
- }
}
@@ -132,10 +118,12 @@ public class PrincipalPermissionsTest ex
assertEquals(Result.ALLOWED, _perms.authorise(Permission.CONSUME, authArgs));
}
- public void testPublish()
+ 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[]{exchange.getNameShortString(), _routingKey};
assertEquals(Result.DENIED, _perms.authorise(Permission.PUBLISH, authArgs));
_perms.grant(Permission.PUBLISH, grantArgs);
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org