svn commit: r701330 - /incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java

[ritchiem]

Author: ritchiem
Date: Fri Oct  3 02:21:40 2008
New Revision: 701330

URL: http://svn.apache.org/viewvc?rev=701330&view=rev
Log:
QPID-1269 : Modified to actually test the type of queue that is returned

Modified:
    
incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java

Modified: 
incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java?rev=701330&r1=701329&r2=701330&view=diff
==============================================================================
--- 
incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
 (original)
+++ 
incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
 Fri Oct  3 02:21:40 2008
@@ -45,7 +45,7 @@
 
     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 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 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)
         {