From ca7aef12e242be18a0645aa59edb93d650c308a6 Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Fri, 3 Oct 2008 09:21:40 +0000 Subject: QPID-1269 : Modified to actually test the type of queue that is returned git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@701330 13f79535-47bb-0310-9956-ffa450edef68 --- .../qpid/server/queue/AMQQueueFactoryTest.java | 23 +++++++--------------- 1 file changed, 7 insertions(+), 16 deletions(-) (limited to 'java') diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java b/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java index 84c243f24b..520e49c56a 100644 --- a/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java +++ b/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java @@ -45,7 +45,7 @@ public class AMQQueueFactoryTest extends TestCase public void tearDown() { - assertEquals("Queue was mot registered in virtualhost", 1, _queueRegistry.getQueues().size()); + assertEquals("Queue was not registered in virtualhost", 1, _queueRegistry.getQueues().size()); ApplicationRegistry.remove(1); } @@ -53,15 +53,14 @@ public class AMQQueueFactoryTest extends TestCase public void testPriorityQueueRegistration() { FieldTable fieldTable = new FieldTable(); - fieldTable.put(new AMQShortString("x-filter-jms-selector"), "NoddySelector=true"); - + fieldTable.put(new AMQShortString(AMQQueueFactory.X_QPID_PRIORITIES), 5); try { - AMQQueueFactory.createAMQQueueImpl(new AMQShortString("testQueue"), false, new AMQShortString("owner"), false, + AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("testPriorityQueue"), false, new AMQShortString("owner"), false, _virtualHost, fieldTable); - //assert you get the right queue back + assertEquals("Queue not a priorty queue", AMQPriorityQueue.class, queue.getClass()); } catch (AMQException e) { @@ -72,19 +71,11 @@ public class AMQQueueFactoryTest extends TestCase public void testSimpleQueueRegistration() { - ApplicationRegistry registry = (ApplicationRegistry) ApplicationRegistry.getInstance(); - - VirtualHost virtualHost = registry.getVirtualHostRegistry().getVirtualHost("test"); - - QueueRegistry queueRegistry = virtualHost.getQueueRegistry(); - - assertEquals("Queues registered on an empty virtualhost", 0, queueRegistry.getQueues().size()); - try { - AMQQueueFactory.createAMQQueueImpl(new AMQShortString("testQueue"), false, new AMQShortString("owner"), false, - virtualHost, null); - //assert you get the right queue back + AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("testQueue"), false, new AMQShortString("owner"), false, + _virtualHost, null); + assertEquals("Queue not a simple queue", SimpleAMQQueue.class, queue.getClass()); } catch (AMQException e) { -- cgit v1.2.1