1 files changed, 119 insertions, 0 deletions
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java
new file mode 100644
index 0000000000..56cd29b0bd
--- /dev/null
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java
@@ -0,0 +1,119 @@
+/*
+ *
+ * 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 java.util.Collections;
+import junit.framework.AssertionFailedError;
+
+import org.apache.qpid.AMQException;
+import org.apache.qpid.server.logging.LogActor;
+import org.apache.qpid.server.logging.actors.CurrentActor;
+import org.apache.qpid.server.message.AMQMessageHeader;
+import org.apache.qpid.server.message.MessageInstance;
+import org.apache.qpid.server.message.ServerMessage;
+
+import java.util.ArrayList;
+import java.util.EnumSet;
+
+import org.apache.qpid.server.model.Queue;
+import org.apache.qpid.server.consumer.Consumer;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class PriorityQueueTest extends SimpleAMQQueueTestBase
+{
+
+    @Override
+    public void setUp() throws Exception
+    {
+        setArguments(Collections.singletonMap(Queue.PRIORITIES,(Object)3));
+        super.setUp();
+    }
+
+    public void testPriorityOrdering() throws AMQException, InterruptedException
+    {
+
+        // Enqueue messages in order
+        SimpleAMQQueue queue = getQueue();
+        queue.enqueue(createMessage(1L, (byte) 10), null);
+        queue.enqueue(createMessage(2L, (byte) 4), null);
+        queue.enqueue(createMessage(3L, (byte) 0), null);
+
+        // Enqueue messages in reverse order
+        queue.enqueue(createMessage(4L, (byte) 0), null);
+        queue.enqueue(createMessage(5L, (byte) 4), null);
+        queue.enqueue(createMessage(6L, (byte) 10), null);
+
+        // Enqueue messages out of order
+        queue.enqueue(createMessage(7L, (byte) 4), null);
+        queue.enqueue(createMessage(8L, (byte) 10), null);
+        queue.enqueue(createMessage(9L, (byte) 0), null);
+
+        // Register subscriber
+        queue.addConsumer(getConsumer(), null, null, "test", EnumSet.noneOf(Consumer.Option.class));
+        Thread.sleep(150);
+
+        ArrayList<MessageInstance> msgs = getConsumer().getMessages();
+        try
+        {
+            assertEquals(1L, msgs.get(0).getMessage().getMessageNumber());
+            assertEquals(6L, msgs.get(1).getMessage().getMessageNumber());
+            assertEquals(8L, msgs.get(2).getMessage().getMessageNumber());
+
+            assertEquals(2L, msgs.get(3).getMessage().getMessageNumber());
+            assertEquals(5L, msgs.get(4).getMessage().getMessageNumber());
+            assertEquals(7L, msgs.get(5).getMessage().getMessageNumber());
+
+            assertEquals(3L, msgs.get(6).getMessage().getMessageNumber());
+            assertEquals(4L, msgs.get(7).getMessage().getMessageNumber());
+            assertEquals(9L, msgs.get(8).getMessage().getMessageNumber());
+        }
+        catch (AssertionFailedError afe)
+        {
+            // Show message order on failure.
+            int index = 1;
+            for (MessageInstance qe : msgs)
+            {
+                System.err.println(index + ":" + qe.getMessage().getMessageNumber());
+                index++;
+            }
+
+            throw afe;
+        }
+
+    }
+
+    protected ServerMessage createMessage(Long id, byte i) throws AMQException
+    {
+
+        ServerMessage msg = super.createMessage(id);
+        AMQMessageHeader hdr = msg.getMessageHeader();
+        when(hdr.getPriority()).thenReturn(i);
+        return msg;
+    }
+
+    protected ServerMessage createMessage(Long id) throws AMQException
+    {
+        return createMessage(id, (byte) 0);
+    }
+
+}