Author: rgodfrey
Date: Mon Nov 28 20:57:56 2016
New Revision: 1771814
URL: http://svn.apache.org/viewvc?rev=1771814&view=rev
Log:
QPID-7546 : DefaultFiltersTest
Modified:
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/DefaultFiltersTest.java
qpid/java/trunk/test-profiles/Java10Excludes
qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes
Modified:
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/DefaultFiltersTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/DefaultFiltersTest.java?rev=1771814&r1=1771813&r2=1771814&view=diff
==============================================================================
---
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/DefaultFiltersTest.java
(original)
+++
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/DefaultFiltersTest.java
Mon Nov 28 20:57:56 2016
@@ -20,6 +20,7 @@
*/
package org.apache.qpid.server.queue;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -55,16 +56,25 @@ public class DefaultFiltersTest extends
_connection.start();
}
- private void createQueueWithDefaultFilter(String selector) throws
QpidException
+ private void createQueueWithDefaultFilter(String selector) throws
QpidException, JMSException
{
final Map<String,Object> arguments = new HashMap<>();
selector = selector.replace("\\", "\\\\");
selector = selector.replace("\"", "\\\"");
-
- arguments.put("qpid.default_filters","{ \"x-filter-jms-selector\" : {
\"x-filter-jms-selector\" : [ \""+selector+"\" ] } }");
- ((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())
+ {
+ createEntityUsingAmqpManagement(_queueName, _session,
"org.apache.qpid.Queue",
+
Collections.<String,Object>singletonMap("defaultFilters", "{
\"x-filter-jms-selector\" : { \"x-filter-jms-selector\" : [ \"" + selector +
"\" ] } }" ));
+ _queue = _session.createQueue(_queueName);
+ }
+ else
+ {
+ arguments.put("qpid.default_filters",
+ "{ \"x-filter-jms-selector\" : {
\"x-filter-jms-selector\" : [ \"" + selector + "\" ] } }");
+ ((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 testDefaultFilterIsApplied() throws QpidException, JMSException
Modified: qpid/java/trunk/test-profiles/Java10Excludes
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/Java10Excludes?rev=1771814&r1=1771813&r2=1771814&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/Java10Excludes (original)
+++ qpid/java/trunk/test-profiles/Java10Excludes Mon Nov 28 20:57:56 2016
@@ -142,6 +142,9 @@ org.apache.qpid.test.unit.client.connect
// Tests conversion between 0-8/9/9-1 and 0-10
org.apache.qpid.server.message.MessageProtocolConversionTest#*
+// Tests the interaction between the Broker's supported protocols and what the
0-x client agrees to
+org.apache.qpid.server.SupportedProtocolVersionsTest#*
+
Modified: qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes?rev=1771814&r1=1771813&r2=1771814&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes (original)
+++ qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes Mon Nov 28
20:57:56 2016
@@ -31,7 +31,6 @@ org.apache.qpid.client.prefetch.Prefetch
org.apache.qpid.client.redelivered.RedeliveredMessageTest#*
org.apache.qpid.client.SynchReceiveTest#*
org.apache.qpid.client.SyncPublishTest#*
-org.apache.qpid.server.SupportedProtocolVersionsTest#*
org.apache.qpid.server.stats.StatisticsReportingTest#*
org.apache.qpid.server.security.acl.ExternalACLTest#*
org.apache.qpid.server.security.acl.ExhaustiveACLTest#*
@@ -39,7 +38,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.DefaultFiltersTest#*
org.apache.qpid.server.queue.ConsumerPriorityTest#*
org.apache.qpid.server.queue.ArrivalTimeFilterTest#*
org.apache.qpid.test.unit.topic.DurableSubscriptionTest#*
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
