Better test for maxdepth checking

Author: Emile Joubert

test/src/com/rabbitmq/client/test/functional/QueueSizeLimit.java

@@ -28,7 +28,7 @@
  */
 public class QueueSizeLimit extends BrokerTestCase {
 
-    private final int MAXDEPTH=5;
+    private final int MAXDEPTH = 5;
     private final String q = "queue";
 
     @Override
@@ -51,7 +51,7 @@ public void testQueueSize() throws IOException, InterruptedException {
         }
     }
 
-    public void testQueueUnacked() throws IOException, InterruptedException {
+    public void testQueueAllUnacked() throws IOException, InterruptedException {
         declareQueue();
         for (int i=1; i <= MAXDEPTH; i++){
             channel.basicPublish ("", q, null, ("msg" + i).getBytes());
@@ -64,6 +64,24 @@ public void testQueueUnacked() throws IOException, InterruptedException {
         assertEquals(null, channel.basicGet(q, false));
     }
 
+    public void testQueueSomeUnacked() throws IOException, InterruptedException {
+        declareQueue();
+        for (int i=1; i <= MAXDEPTH - 1; i++){
+            channel.basicPublish ("", q, null, ("msg" + i).getBytes());
+            channel.waitForConfirmsOrDie();
+            channel.basicGet(q, false);
+            assertEquals(0, declareQueue());
+        }
+        channel.basicPublish("", q, null, ("msg" + MAXDEPTH).getBytes());
+        channel.waitForConfirmsOrDie();
+        assertEquals(1, declareQueue());
+
+        channel.basicPublish("", q, null, ("msg overflow").getBytes());
+        channel.waitForConfirmsOrDie();
+        assertEquals("msg overflow", new String(channel.basicGet(q, false).getBody()));
+        assertEquals(null, channel.basicGet(q, false));
+    }
+
     private int declareQueue() throws IOException {
         Map<String, Object> args = new HashMap<String, Object>();
         args.put("x-maxdepth", MAXDEPTH);