You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2016/11/25 10:48:20 UTC
svn commit: r1771276 - in /qpid/java/trunk:
systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
systests/src/test/java/org/apache/qpid/server/logging/AccessControlLoggingTest.java
test-profiles/Java10UninvestigatedTestsExcludes
Author: rgodfrey
Date: Fri Nov 25 10:48:19 2016
New Revision: 1771276
URL: http://svn.apache.org/viewvc?rev=1771276&view=rev
Log:
QPID-7546 : Switch AccessControlLoggingTest to use AMQP management to create objects
Modified:
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/AccessControlLoggingTest.java
qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes
Modified: qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java?rev=1771276&r1=1771275&r2=1771276&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (original)
+++ qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java Fri Nov 25 10:48:19 2016
@@ -20,6 +20,7 @@ package org.apache.qpid.test.utils;
import java.io.File;
import java.net.URISyntaxException;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Hashtable;
import java.util.Iterator;
@@ -433,16 +434,26 @@ public class QpidBrokerTestCase extends
}
}
- private void createEntityUsingAmqpManagement(final String name, final Session session, final String type)
+ protected void createEntityUsingAmqpManagement(final String name, final Session session, final String type)
throws JMSException
{
- MessageProducer producer = session.createProducer(session.createQueue("$management"));
+ createEntityUsingAmqpManagement(name, session, type, Collections.<String,Object>emptyMap());
+ }
+
+ protected void createEntityUsingAmqpManagement(final String name, final Session session, final String type, Map<String, Object> attributes)
+ throws JMSException
+ {
+ MessageProducer producer = session.createProducer(session.createQueue(isBroker10() ? "$management" : "ADDR:$management"));
MapMessage createMessage = session.createMapMessage();
createMessage.setStringProperty("type", type);
createMessage.setStringProperty("operation", "CREATE");
createMessage.setString("name", name);
createMessage.setString("object-path", name);
+ for(Map.Entry<String,Object> entry : attributes.entrySet())
+ {
+ createMessage.setObject(entry.getKey(), entry.getValue());
+ }
producer.send(createMessage);
if(session.getTransacted())
{
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/AccessControlLoggingTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/AccessControlLoggingTest.java?rev=1771276&r1=1771275&r2=1771276&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/AccessControlLoggingTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/AccessControlLoggingTest.java Fri Nov 25 10:48:19 2016
@@ -18,15 +18,18 @@
*/
package org.apache.qpid.server.logging;
+import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Map;
import javax.jms.Connection;
import javax.jms.JMSException;
import javax.jms.Session;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.client.AMQSession;
-import org.apache.qpid.protocol.ErrorCodes;
+import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.model.ExclusivityPolicy;
+import org.apache.qpid.server.model.LifetimePolicy;
+import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.security.acl.AbstractACLTestCase;
/**
@@ -45,6 +48,8 @@ public class AccessControlLoggingTest ex
private static final String ACL_LOG_PREFIX = "ACL-";
private static final String USER = "client";
private static final String PASS = "guest";
+ private Connection _connection;
+ private Session _session;
public void setUp() throws Exception
{
@@ -53,10 +58,15 @@ public class AccessControlLoggingTest ex
"ACL ALLOW client CREATE QUEUE name='allow'",
"ACL ALLOW-LOG client CREATE QUEUE name='allow-log'",
"ACL DENY client CREATE QUEUE name='deny'",
- "ACL DENY-LOG client CREATE QUEUE name='deny-log'");
+ "ACL DENY-LOG client CREATE QUEUE name='deny-log'",
+ "ACL ALLOW client PUBLISH EXCHANGE name='' routingkey='$management");
super.setUp();
+ _connection = getConnection(USER, PASS);
+ _session = _connection.createSession(true, Session.SESSION_TRANSACTED);
+ _connection.start();
+
}
@Override
@@ -64,6 +74,7 @@ public class AccessControlLoggingTest ex
{
try
{
+ _connection.close();
super.tearDown();
}
catch (JMSException e)
@@ -78,25 +89,52 @@ public class AccessControlLoggingTest ex
*/
public void testAllow() throws Exception
{
- Connection conn = getConnection(USER, PASS);
- Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
- conn.start();
- ((AMQSession<?, ?>) sess).createQueue("allow", false, false, false);
+ String name = "allow";
+ boolean autoDelete = false;
+ boolean durable = false;
+ boolean exclusive = false;
+ createQueue(name, autoDelete, durable, exclusive);
List<String> matches = findMatches(ACL_LOG_PREFIX + 1001);
assertTrue("Should be no ACL log messages", matches.isEmpty());
}
+ protected void createQueue(final String name,
+ final boolean autoDelete,
+ final boolean durable, final boolean exclusive)
+ throws JMSException
+ {
+ Map<String,Object> attributes = new LinkedHashMap<>();
+ attributes.put(ConfiguredObject.NAME, name);
+ attributes.put(ConfiguredObject.DURABLE, durable);
+ LifetimePolicy lifetimePolicy;
+ ExclusivityPolicy exclusivityPolicy;
+
+ if (exclusive)
+ {
+ lifetimePolicy = autoDelete
+ ? LifetimePolicy.DELETE_ON_NO_OUTBOUND_LINKS
+ : durable ? LifetimePolicy.PERMANENT : LifetimePolicy.DELETE_ON_CONNECTION_CLOSE;
+ exclusivityPolicy = durable ? ExclusivityPolicy.CONTAINER : ExclusivityPolicy.CONNECTION;
+ }
+ else
+ {
+ lifetimePolicy = autoDelete ? LifetimePolicy.DELETE_ON_NO_OUTBOUND_LINKS : LifetimePolicy.PERMANENT;
+ exclusivityPolicy = ExclusivityPolicy.NONE;
+ }
+
+ attributes.put(Queue.EXCLUSIVE, exclusivityPolicy.toString());
+ attributes.put(Queue.LIFETIME_POLICY, lifetimePolicy.toString());
+ createEntityUsingAmqpManagement(name, _session, "org.apache.qpid.Queue", attributes);
+ }
+
/**
* Test that {@code allow-log} ACL entries log correctly.
*/
public void testAllowLog() throws Exception
{
- Connection conn = getConnection(USER, PASS);
- Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
- conn.start();
- ((AMQSession<?, ?>) sess).createQueue("allow-log", false, false, false);
+ createQueue("allow-log", false, false, false);
List<String> matches = findMatches(ACL_LOG_PREFIX + 1001);
@@ -121,19 +159,7 @@ public class AccessControlLoggingTest ex
*/
public void testDenyLog() throws Exception
{
- Connection conn = getConnection(USER, PASS);
- Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
- conn.start();
- try
- {
- ((AMQSession<?, ?>) sess).createQueue("deny-log", false, false, false);
- fail("Should have denied queue creation");
- }
- catch (AMQException amqe)
- {
- // Denied, so exception thrown
- assertEquals("Expected ACCESS_REFUSED error code", ErrorCodes.ACCESS_REFUSED, amqe.getErrorCode());
- }
+ createQueue("deny-log", false, false, false);
List<String> matches = findMatches(ACL_LOG_PREFIX + 1002);
@@ -158,19 +184,7 @@ public class AccessControlLoggingTest ex
*/
public void testDeny() throws Exception
{
- Connection conn = getConnection(USER, PASS);
- Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
- conn.start();
- try
- {
- ((AMQSession<?, ?>) sess).createQueue("deny", false, false, false);
- fail("Should have denied queue creation");
- }
- catch (AMQException amqe)
- {
- // Denied, so exception thrown
- assertEquals("Expected ACCESS_REFUSED error code", ErrorCodes.ACCESS_REFUSED, amqe.getErrorCode());
- }
+ createQueue("deny", false, false, false);
List<String> matches = findMatches(ACL_LOG_PREFIX + 1002);
Modified: qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes
URL: http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes?rev=1771276&r1=1771275&r2=1771276&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes (original)
+++ qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes Fri Nov 25 10:48:19 2016
@@ -21,7 +21,6 @@
// working, defined as broken, or excluded as they test version specific functionality
org.apache.qpid.server.AbruptClientDisconnectTest#*
-org.apache.qpid.server.logging.AccessControlLoggingTest#*
org.apache.qpid.server.logging.AlertingTest#*
org.apache.qpid.server.logging.BindingLoggingTest#*
org.apache.qpid.server.logging.ChannelLoggingTest#*
@@ -45,7 +44,6 @@ org.apache.qpid.client.session.ExchangeD
org.apache.qpid.client.session.QueueDeclareTest#*
org.apache.qpid.client.session.QueueDeleteTest#*
org.apache.qpid.test.client.failover.FailoverTest#*
-//org.apache.qpid.test.client.DupsOkTest#*
org.apache.qpid.systest.prefetch.ZeroPrefetchTest#*
org.apache.qpid.systest.messageencryption.MessageEncryptionTest#*
org.apache.qpid.systest.MessageCompressionTest#*
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org