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/28 16:58:53 UTC
svn commit: r1771768 - in /qpid/java/trunk:
systests/src/test/java/org/apache/qpid/server/queue/EnsureNondestructiveConsumersTest.java
test-profiles/Java10UninvestigatedTestsExcludes
Author: rgodfrey
Date: Mon Nov 28 16:58:53 2016
New Revision: 1771768
URL: http://svn.apache.org/viewvc?rev=1771768&view=rev
Log:
QPID-7546 : EnsureNondestructiveConsumersTest
Modified:
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/EnsureNondestructiveConsumersTest.java
qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/EnsureNondestructiveConsumersTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/EnsureNondestructiveConsumersTest.java?rev=1771768&r1=1771767&r2=1771768&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/EnsureNondestructiveConsumersTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/EnsureNondestructiveConsumersTest.java Mon Nov 28 16:58:53 2016
@@ -55,15 +55,26 @@ public class EnsureNondestructiveConsume
_connection.start();
}
- private void createQueueEnsureNondestructiveConsumerOption(boolean ensureNonDestructiveConsumer) throws
- QpidException
+ private void createQueueEnsureNondestructiveConsumerOption(boolean ensureNonDestructiveConsumer)
+ throws QpidException, JMSException
{
final Map<String,Object> arguments = new HashMap<>();
-
- arguments.put("qpid.ensure_nondestructive_consumers", String.valueOf(ensureNonDestructiveConsumer));
- ((AMQSession<?,?>) _session).createQueue(_queueName, false, true, false, arguments);
- _queue = new org.apache.qpid.client.AMQQueue("amq.direct", _queueName);
- ((AMQSession<?,?>) _session).declareAndBind((AMQDestination)_queue);
+ if(isBroker10())
+ {
+ if(ensureNonDestructiveConsumer)
+ {
+ arguments.put("ensureNondestructiveConsumers", true);
+ }
+ createEntityUsingAmqpManagement(_queueName, _session, "org.apache.qpid.Queue", arguments);
+ _queue = _session.createQueue(_queueName);
+ }
+ else
+ {
+ arguments.put("qpid.ensure_nondestructive_consumers", String.valueOf(ensureNonDestructiveConsumer));
+ ((AMQSession<?, ?>) _session).createQueue(_queueName, false, true, false, arguments);
+ _queue = new org.apache.qpid.client.AMQQueue("amq.direct", _queueName);
+ ((AMQSession<?, ?>) _session).declareAndBind((AMQDestination) _queue);
+ }
}
public void testEnsureNondestructiveConsumers() throws QpidException, JMSException
Modified: qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes
URL: http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes?rev=1771768&r1=1771767&r2=1771768&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes (original)
+++ qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes Mon Nov 28 16:58:53 2016
@@ -42,7 +42,6 @@ org.apache.qpid.server.queue.ProducerFlo
org.apache.qpid.server.queue.MultipleTransactedBatchProducerTest#*
org.apache.qpid.server.queue.ModelTest#*
org.apache.qpid.server.queue.LiveQueueOperationsTest#*
-org.apache.qpid.server.queue.EnsureNondestructiveConsumersTest#*
org.apache.qpid.server.queue.DefaultFiltersTest#*
org.apache.qpid.server.queue.ConsumerPriorityTest#*
org.apache.qpid.server.queue.ArrivalTimeFilterTest#*
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org