QPID-1768 : Removed all the special priority queue code. Added the ability for a FlowableBaseQueueEntryList to delegate its accounting to a parent QueueEntryList. This results in the PriorityQueueEntryList using the same FtD algorithm as SimpleQELs.

    - New Messages on a flowed queue are pushed optimistically pushed to disk, this should potentially be removed and just rely on the purger to flush the correct message which in the Priority case may not be the last message in.
    - When space is available messages are loaded in queue order, so in this case Priority order.



git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@758742 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 0 insertions, 24 deletions

diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryPriorityTest.java b/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryPriorityTest.java
index 0d6c5948b4..ee3e727b80 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryPriorityTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryPriorityTest.java
@@ -50,21 +50,4 @@ public class AMQQueueFactoryPriorityTest extends AMQQueueFactoryTest
             fail(e.getMessage());
         }
     }
-
-    @Override
-    public void testQueueValuesAfterCreation()
-    {
-        try
-        {
-            AMQQueue queue = createQueue();
-
-            assertEquals("MemoryMaximumSize not set correctly:", MAX_SIZE, queue.getMemoryUsageMaximum());
-            //NOTE: Priority queue will show 0 as minimum as the minimum value is actually spread between its sub QELs
-            assertEquals("MemoryMinimumSize not 0 as expected for a priority queue:", 0, queue.getMemoryUsageMinimum());
-        }
-        catch (AMQException e)
-        {
-            fail(e.getMessage());
-        }
-    }
 }
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQMessage.java b/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQMessage.java
index 11049a7ae3..0f4230806f 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQMessage.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQMessage.java
@@ -48,11 +48,4 @@ public class MockAMQMessage extends TransientAMQMessage
         _contentHeaderBody = new ContentHeaderBody(properties, BasicPublishBodyImpl.CLASS_ID);
         _contentBodies = new ArrayList<ContentChunk>();
     }
-
-
-    @Override
-    public long getSize()
-    {
-        return 0l;
-    }
 }