From a16002f9be0a06da956eb548d70a3fcd1adeab89 Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Thu, 19 Jun 2008 09:01:59 +0000 Subject: QPID-950 : Broker refactoring, copied / merged from branch git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@669431 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/qpid/server/queue/PriorityTest.java | 176 +++++++++++++++++++++ 1 file changed, 176 insertions(+) create mode 100644 qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java (limited to 'qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java') diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java new file mode 100644 index 0000000000..0dbf95052f --- /dev/null +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java @@ -0,0 +1,176 @@ +/* +* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, +* software distributed under the License is distributed on an +* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +* KIND, either express or implied. See the License for the +* specific language governing permissions and limitations +* under the License. +* +*/ +package org.apache.qpid.server.queue; + +import junit.framework.TestCase; +import junit.framework.Assert; +import org.apache.log4j.Logger; +import org.apache.qpid.client.transport.TransportConnection; +import org.apache.qpid.client.AMQConnection; +import org.apache.qpid.client.AMQSession; +import org.apache.qpid.client.AMQQueue; +import org.apache.qpid.client.AMQDestination; +import org.apache.qpid.jndi.PropertiesFileInitialContextFactory; +import org.apache.qpid.url.URLSyntaxException; +import org.apache.qpid.AMQException; +import org.apache.qpid.framing.AMQShortString; +import org.apache.qpid.framing.FieldTable; + +import javax.jms.*; +import javax.naming.NamingException; +import javax.naming.Context; +import javax.naming.spi.InitialContextFactory; +import java.util.Hashtable; +import java.util.HashMap; +import java.util.Map; + +/** Test Case provided by client Non-functional Test NF101: heap exhaustion behaviour */ +public class PriorityTest extends TestCase +{ + private static final Logger _logger = Logger.getLogger(PriorityTest.class); + + + protected final String BROKER = "vm://:1"; + protected final String VHOST = "/test"; + protected final String QUEUE = "PriorityQueue"; + + + private static final int MSG_COUNT = 50; + + protected void setUp() throws Exception + { + super.setUp(); + + if (usingInVMBroker()) + { + TransportConnection.createVMBroker(1); + } + + + } + + private boolean usingInVMBroker() + { + return BROKER.startsWith("vm://"); + } + + protected void tearDown() throws Exception + { + if (usingInVMBroker()) + { + TransportConnection.killAllVMBrokers(); + } + super.tearDown(); + } + + public void testPriority() throws JMSException, NamingException, AMQException + { + InitialContextFactory factory = new PropertiesFileInitialContextFactory(); + + Hashtable env = new Hashtable(); + + env.put("connectionfactory.connection", "amqp://guest:guest@PRIORITY_TEST_ID" + VHOST + "?brokerlist='" + BROKER + "'"); + env.put("queue.queue", QUEUE); + + Context context = factory.getInitialContext(env); + + Connection producerConnection = ((ConnectionFactory) context.lookup("connection")).createConnection(); + + Session producerSession = producerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE); + + final Map arguments = new HashMap(); + arguments.put("x-qpid-priorities",10); + + ((AMQSession) producerSession).createQueue(new AMQShortString(QUEUE), true, false, false, arguments); + + Queue queue = new AMQQueue("amq.direct",QUEUE); + + ((AMQSession) producerSession).declareAndBind((AMQDestination)queue); + + + + + + + producerConnection.start(); + + + MessageProducer producer = producerSession.createProducer(queue); + + + + + + for (int msg = 0; msg < MSG_COUNT; msg++) + { + producer.setPriority(msg % 10); + producer.send(nextMessage(msg, false, producerSession, producer)); + } + + producer.close(); + producerSession.close(); + producerConnection.close(); + + + Connection consumerConnection = ((ConnectionFactory) context.lookup("connection")).createConnection(); + Session consumerSession = consumerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE); + MessageConsumer consumer = consumerSession.createConsumer(queue); + + + + + consumerConnection.start(); + + Message received; + //Receive Message 0 + StringBuilder buf = new StringBuilder(); + int receivedCount = 0; + Message previous = null; + int messageCount = 0; + while((received = consumer.receive(1000))!=null) + { + messageCount++; + if(previous != null) + { + assertTrue("Messages arrived in unexpected order " + messageCount + " " + previous.getIntProperty("msg") + " " + received.getIntProperty("msg") + " " + previous.getJMSPriority() + " " + received.getJMSPriority(), (previous.getJMSPriority() > received.getJMSPriority()) || ((previous.getJMSPriority() == received.getJMSPriority()) && previous.getIntProperty("msg") < received.getIntProperty("msg")) ); + } + + previous = received; + receivedCount++; + } + + assertEquals("Incorrect number of message received", 50, receivedCount); + + producerSession.close(); + producer.close(); + + } + + private Message nextMessage(int msg, boolean first, Session producerSession, MessageProducer producer) throws JMSException + { + Message send = producerSession.createTextMessage("Message: " + msg); + send.setIntProperty("msg", msg); + + return send; + } + + +} -- cgit v1.2.1 From 09f60acd6ba474bfeed068f10d966938f806ff77 Mon Sep 17 00:00:00 2001 From: Aidan Skinner Date: Thu, 18 Sep 2008 16:12:46 +0000 Subject: QPID-1286: make sure priority queues don't mess with deleted subscriptions AMQPriorityQueue: don't advance deleted subscriptions AMQPriorityQueueTest: Add test class for priority queues SimpleAMQQueueTest: Add more tests PriorityTest: Check for more message orders git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@696686 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/qpid/server/queue/PriorityTest.java | 150 ++++++++++++++------- 1 file changed, 102 insertions(+), 48 deletions(-) (limited to 'qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java') diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java index 0dbf95052f..b8e5980f26 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java @@ -52,9 +52,19 @@ public class PriorityTest extends TestCase protected final String VHOST = "/test"; protected final String QUEUE = "PriorityQueue"; - private static final int MSG_COUNT = 50; + private Context context = null; + private Connection producerConnection; + private MessageProducer producer; + private Session producerSession; + private Queue queue; + private Connection consumerConnection; + private Session consumerSession; + + + private MessageConsumer consumer; + protected void setUp() throws Exception { super.setUp(); @@ -64,7 +74,21 @@ public class PriorityTest extends TestCase TransportConnection.createVMBroker(1); } + InitialContextFactory factory = new PropertiesFileInitialContextFactory(); + Hashtable env = new Hashtable(); + + env.put("connectionfactory.connection", "amqp://guest:guest@PRIORITY_TEST_ID" + VHOST + "?brokerlist='" + BROKER + "'"); + env.put("queue.queue", QUEUE); + + context = factory.getInitialContext(env); + producerConnection = ((ConnectionFactory) context.lookup("connection")).createConnection(); + producerSession = producerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE); + producerConnection.start(); + + consumerConnection = ((ConnectionFactory) context.lookup("connection")).createConnection(); + consumerSession = consumerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE); + } private boolean usingInVMBroker() @@ -74,6 +98,8 @@ public class PriorityTest extends TestCase protected void tearDown() throws Exception { + producerConnection.close(); + consumerConnection.close(); if (usingInVMBroker()) { TransportConnection.killAllVMBrokers(); @@ -83,65 +109,25 @@ public class PriorityTest extends TestCase public void testPriority() throws JMSException, NamingException, AMQException { - InitialContextFactory factory = new PropertiesFileInitialContextFactory(); - - Hashtable env = new Hashtable(); - - env.put("connectionfactory.connection", "amqp://guest:guest@PRIORITY_TEST_ID" + VHOST + "?brokerlist='" + BROKER + "'"); - env.put("queue.queue", QUEUE); - - Context context = factory.getInitialContext(env); - - Connection producerConnection = ((ConnectionFactory) context.lookup("connection")).createConnection(); - - Session producerSession = producerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE); - final Map arguments = new HashMap(); arguments.put("x-qpid-priorities",10); - ((AMQSession) producerSession).createQueue(new AMQShortString(QUEUE), true, false, false, arguments); - - Queue queue = new AMQQueue("amq.direct",QUEUE); - + queue = new AMQQueue("amq.direct",QUEUE); ((AMQSession) producerSession).declareAndBind((AMQDestination)queue); - - - - - - - producerConnection.start(); - - - MessageProducer producer = producerSession.createProducer(queue); - - - - + producer = producerSession.createProducer(queue); for (int msg = 0; msg < MSG_COUNT; msg++) { producer.setPriority(msg % 10); producer.send(nextMessage(msg, false, producerSession, producer)); } - producer.close(); producerSession.close(); producerConnection.close(); - - Connection consumerConnection = ((ConnectionFactory) context.lookup("connection")).createConnection(); - Session consumerSession = consumerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE); - MessageConsumer consumer = consumerSession.createConsumer(queue); - - - - + consumer = consumerSession.createConsumer(queue); consumerConnection.start(); - Message received; - //Receive Message 0 - StringBuilder buf = new StringBuilder(); int receivedCount = 0; Message previous = null; int messageCount = 0; @@ -158,10 +144,78 @@ public class PriorityTest extends TestCase } assertEquals("Incorrect number of message received", 50, receivedCount); - - producerSession.close(); - producer.close(); - + } + + public void testOddOrdering() throws AMQException, JMSException + { + final Map arguments = new HashMap(); + arguments.put("x-qpid-priorities",3); + ((AMQSession) producerSession).createQueue(new AMQShortString(QUEUE), true, false, false, arguments); + queue = new AMQQueue("amq.direct",QUEUE); + ((AMQSession) producerSession).declareAndBind((AMQDestination)queue); + producer = producerSession.createProducer(queue); + + // In order ABC + producer.setPriority(9); + producer.send(nextMessage(1, false, producerSession, producer)); + producer.setPriority(4); + producer.send(nextMessage(2, false, producerSession, producer)); + producer.setPriority(1); + producer.send(nextMessage(3, false, producerSession, producer)); + + // Out of order BAC + producer.setPriority(4); + producer.send(nextMessage(4, false, producerSession, producer)); + producer.setPriority(9); + producer.send(nextMessage(5, false, producerSession, producer)); + producer.setPriority(1); + producer.send(nextMessage(6, false, producerSession, producer)); + + // Out of order BCA + producer.setPriority(4); + producer.send(nextMessage(7, false, producerSession, producer)); + producer.setPriority(1); + producer.send(nextMessage(8, false, producerSession, producer)); + producer.setPriority(9); + producer.send(nextMessage(9, false, producerSession, producer)); + + // Reverse order CBA + producer.setPriority(1); + producer.send(nextMessage(10, false, producerSession, producer)); + producer.setPriority(4); + producer.send(nextMessage(11, false, producerSession, producer)); + producer.setPriority(9); + producer.send(nextMessage(12, false, producerSession, producer)); + + consumer = consumerSession.createConsumer(queue); + consumerConnection.start(); + + Message msg = consumer.receive(500); + assertEquals(1, msg.getIntProperty("msg")); + msg = consumer.receive(500); + assertEquals(5, msg.getIntProperty("msg")); + msg = consumer.receive(500); + assertEquals(9, msg.getIntProperty("msg")); + msg = consumer.receive(500); + assertEquals(12, msg.getIntProperty("msg")); + + msg = consumer.receive(500); + assertEquals(2, msg.getIntProperty("msg")); + msg = consumer.receive(500); + assertEquals(4, msg.getIntProperty("msg")); + msg = consumer.receive(500); + assertEquals(7, msg.getIntProperty("msg")); + msg = consumer.receive(500); + assertEquals(11, msg.getIntProperty("msg")); + + msg = consumer.receive(500); + assertEquals(3, msg.getIntProperty("msg")); + msg = consumer.receive(500); + assertEquals(6, msg.getIntProperty("msg")); + msg = consumer.receive(500); + assertEquals(8, msg.getIntProperty("msg")); + msg = consumer.receive(500); + assertEquals(10, msg.getIntProperty("msg")); } private Message nextMessage(int msg, boolean first, Session producerSession, MessageProducer producer) throws JMSException -- cgit v1.2.1 From 736849a94f57af87400eddf6b66f00fa3a6a8e1e Mon Sep 17 00:00:00 2001 From: Aidan Skinner Date: Fri, 19 Sep 2008 09:53:33 +0000 Subject: QPID-1286: make timeout a constant git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@697021 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/qpid/server/queue/PriorityTest.java | 27 ++++++++++++---------- 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java') diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java index b8e5980f26..3a4e6a62f8 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java @@ -45,6 +45,9 @@ import java.util.Map; /** Test Case provided by client Non-functional Test NF101: heap exhaustion behaviour */ public class PriorityTest extends TestCase { + private static final int TIMEOUT = 1500; + + private static final Logger _logger = Logger.getLogger(PriorityTest.class); @@ -190,31 +193,31 @@ public class PriorityTest extends TestCase consumer = consumerSession.createConsumer(queue); consumerConnection.start(); - Message msg = consumer.receive(500); + Message msg = consumer.receive(TIMEOUT); assertEquals(1, msg.getIntProperty("msg")); - msg = consumer.receive(500); + msg = consumer.receive(TIMEOUT); assertEquals(5, msg.getIntProperty("msg")); - msg = consumer.receive(500); + msg = consumer.receive(TIMEOUT); assertEquals(9, msg.getIntProperty("msg")); - msg = consumer.receive(500); + msg = consumer.receive(TIMEOUT); assertEquals(12, msg.getIntProperty("msg")); - msg = consumer.receive(500); + msg = consumer.receive(TIMEOUT); assertEquals(2, msg.getIntProperty("msg")); - msg = consumer.receive(500); + msg = consumer.receive(TIMEOUT); assertEquals(4, msg.getIntProperty("msg")); - msg = consumer.receive(500); + msg = consumer.receive(TIMEOUT); assertEquals(7, msg.getIntProperty("msg")); - msg = consumer.receive(500); + msg = consumer.receive(TIMEOUT); assertEquals(11, msg.getIntProperty("msg")); - msg = consumer.receive(500); + msg = consumer.receive(TIMEOUT); assertEquals(3, msg.getIntProperty("msg")); - msg = consumer.receive(500); + msg = consumer.receive(TIMEOUT); assertEquals(6, msg.getIntProperty("msg")); - msg = consumer.receive(500); + msg = consumer.receive(TIMEOUT); assertEquals(8, msg.getIntProperty("msg")); - msg = consumer.receive(500); + msg = consumer.receive(TIMEOUT); assertEquals(10, msg.getIntProperty("msg")); } -- cgit v1.2.1 From 4413aa15a5302356a758ad2d86342fd45279bacb Mon Sep 17 00:00:00 2001 From: Aidan Skinner Date: Fri, 19 Sep 2008 14:15:51 +0000 Subject: QPID-1286: use transactions to make sure all messages are in there before starting the consumer git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@697100 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/org/apache/qpid/server/queue/PriorityTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java') diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java index 3a4e6a62f8..bb386f9f6f 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java @@ -85,7 +85,7 @@ public class PriorityTest extends TestCase context = factory.getInitialContext(env); producerConnection = ((ConnectionFactory) context.lookup("connection")).createConnection(); - producerSession = producerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE); + producerSession = producerConnection.createSession(true, Session.AUTO_ACKNOWLEDGE); producerConnection.start(); @@ -124,6 +124,7 @@ public class PriorityTest extends TestCase producer.setPriority(msg % 10); producer.send(nextMessage(msg, false, producerSession, producer)); } + producerSession.commit(); producer.close(); producerSession.close(); producerConnection.close(); @@ -189,7 +190,8 @@ public class PriorityTest extends TestCase producer.send(nextMessage(11, false, producerSession, producer)); producer.setPriority(9); producer.send(nextMessage(12, false, producerSession, producer)); - + producerSession.commit(); + consumer = consumerSession.createConsumer(queue); consumerConnection.start(); -- cgit v1.2.1 From 45dd4acdb87e52a1078b771c116b339b2fe775bb Mon Sep 17 00:00:00 2001 From: Aidan Skinner Date: Wed, 14 Jan 2009 13:05:45 +0000 Subject: QPID-1573: Change AMQQueueDeferredOrderingTest, ReturnUnroutableMandatoryMessageTest, DispatcherTest, PriorityTest and TimeToLiveTest to extend QpidTestCase Add ReturnUnroutableMandatoryMessageTest, PriorityTest and TimeToLiveTest to the 010ExcludeList git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@734379 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/qpid/server/queue/PriorityTest.java | 33 +++------------------- 1 file changed, 4 insertions(+), 29 deletions(-) (limited to 'qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java') diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java index bb386f9f6f..35b4d7c772 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java @@ -29,6 +29,7 @@ import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQDestination; import org.apache.qpid.jndi.PropertiesFileInitialContextFactory; +import org.apache.qpid.test.utils.QpidTestCase; import org.apache.qpid.url.URLSyntaxException; import org.apache.qpid.AMQException; import org.apache.qpid.framing.AMQShortString; @@ -42,22 +43,17 @@ import java.util.Hashtable; import java.util.HashMap; import java.util.Map; -/** Test Case provided by client Non-functional Test NF101: heap exhaustion behaviour */ -public class PriorityTest extends TestCase +public class PriorityTest extends QpidTestCase { private static final int TIMEOUT = 1500; private static final Logger _logger = Logger.getLogger(PriorityTest.class); - - protected final String BROKER = "vm://:1"; - protected final String VHOST = "/test"; protected final String QUEUE = "PriorityQueue"; private static final int MSG_COUNT = 50; - private Context context = null; private Connection producerConnection; private MessageProducer producer; private Session producerSession; @@ -72,41 +68,20 @@ public class PriorityTest extends TestCase { super.setUp(); - if (usingInVMBroker()) - { - TransportConnection.createVMBroker(1); - } - - InitialContextFactory factory = new PropertiesFileInitialContextFactory(); - Hashtable env = new Hashtable(); - - env.put("connectionfactory.connection", "amqp://guest:guest@PRIORITY_TEST_ID" + VHOST + "?brokerlist='" + BROKER + "'"); - env.put("queue.queue", QUEUE); - - context = factory.getInitialContext(env); - producerConnection = ((ConnectionFactory) context.lookup("connection")).createConnection(); + producerConnection = getConnection(); producerSession = producerConnection.createSession(true, Session.AUTO_ACKNOWLEDGE); producerConnection.start(); - consumerConnection = ((ConnectionFactory) context.lookup("connection")).createConnection(); + consumerConnection = getConnection(); consumerSession = consumerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE); } - private boolean usingInVMBroker() - { - return BROKER.startsWith("vm://"); - } - protected void tearDown() throws Exception { producerConnection.close(); consumerConnection.close(); - if (usingInVMBroker()) - { - TransportConnection.killAllVMBrokers(); - } super.tearDown(); } -- cgit v1.2.1 From db6241e3cfb4ef420025ba5c8b8ddae888c7171c Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Wed, 9 Dec 2009 23:58:25 +0000 Subject: QPID-2258 : AMQP0-9-1 Compliance fixes git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@889022 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/org/apache/qpid/server/queue/PriorityTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java') diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java index 35b4d7c772..ca38807fb1 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java @@ -90,7 +90,8 @@ public class PriorityTest extends QpidTestCase final Map arguments = new HashMap(); arguments.put("x-qpid-priorities",10); ((AMQSession) producerSession).createQueue(new AMQShortString(QUEUE), true, false, false, arguments); - queue = new AMQQueue("amq.direct",QUEUE); + queue = (Queue) producerSession.createQueue("direct://amq.direct/"+QUEUE+"/"+QUEUE+"?durable='false'&autodelete='true'"); + ((AMQSession) producerSession).declareAndBind((AMQDestination)queue); producer = producerSession.createProducer(queue); @@ -130,7 +131,8 @@ public class PriorityTest extends QpidTestCase final Map arguments = new HashMap(); arguments.put("x-qpid-priorities",3); ((AMQSession) producerSession).createQueue(new AMQShortString(QUEUE), true, false, false, arguments); - queue = new AMQQueue("amq.direct",QUEUE); + queue = producerSession.createQueue("direct://amq.direct/"+QUEUE+"/"+QUEUE+"?durable='false'&autodelete='true'"); + ((AMQSession) producerSession).declareAndBind((AMQDestination)queue); producer = producerSession.createProducer(queue); -- cgit v1.2.1 From fc324fe97d76c61d0adcc9d2a20dbdc1d17a51cc Mon Sep 17 00:00:00 2001 From: Rajith Muditha Attapattu Date: Wed, 2 Jun 2010 16:14:28 +0000 Subject: QPID-2639 Changed all existing test cases that extened QpidTestCase to QpidBrokerTestCase. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@950617 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/org/apache/qpid/server/queue/PriorityTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java') diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java index ca38807fb1..6203e8a194 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java @@ -29,7 +29,7 @@ import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQDestination; import org.apache.qpid.jndi.PropertiesFileInitialContextFactory; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.qpid.url.URLSyntaxException; import org.apache.qpid.AMQException; import org.apache.qpid.framing.AMQShortString; @@ -43,7 +43,7 @@ import java.util.Hashtable; import java.util.HashMap; import java.util.Map; -public class PriorityTest extends QpidTestCase +public class PriorityTest extends QpidBrokerTestCase { private static final int TIMEOUT = 1500; -- cgit v1.2.1