nuke 'immediate' from tests

since we are dropping it from the broker
we will keep it in the API though

Author: rade

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

@@ -139,36 +139,35 @@ protected void checkGet(boolean[] expected) throws IOException {
      *
      * @param key the routing key of the message to be sent
      * @param mandatory whether the message should be marked as 'mandatory'
-     * @param immediate whether the message should be marked as 'immediate'
      * @param expected indicates which queues we expect the message to
      *        get routed to
      * @param ret whether a 'basic.return' is expected
      *
      * @see #checkGet(boolean[])
      */
-    protected void check(String key, boolean mandatory, boolean immediate,
-                         boolean[] expected, boolean ret)
+    protected void check(String key, boolean mandatory, boolean[] expected,
+                         boolean ret)
         throws IOException {
 
         gotReturn.set(false);
-        channel.basicPublish("x", key, mandatory, immediate, null,
+        channel.basicPublish("x", key, mandatory, false, null,
                              "ae-test".getBytes());
         checkGet(expected);
         assertEquals(ret, gotReturn.get());
     }
 
     protected void check(String key, boolean[] expected, boolean ret)
         throws IOException {
-        check(key, false, false, expected, ret);
+        check(key, false, expected, ret);
     }
 
-    protected void check(String key, boolean mandatory, boolean immediate,
-                         boolean ret) throws IOException {
-        check(key, mandatory, immediate, expected(key), ret);
+    protected void check(String key, boolean mandatory, boolean ret)
+        throws IOException {
+        check(key, mandatory, expected(key), ret);
     }
 
     protected void check(String key, boolean ret) throws IOException {
-        check(key, false, false, ret);
+        check(key, false, ret);
     }
 
     /**
@@ -198,9 +197,7 @@ public void testAe() throws IOException {
             //ordinary
             check(k, false);
             //mandatory
-            check(k, true, false, k.equals("z"));
-            //immediate
-            check(k, false, true, unrouted, true);
+            check(k, true, k.equals("z"));
         }
 
         cleanup();

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

@@ -60,45 +60,34 @@ protected void setUp() throws IOException {
                           "confirm-multiple-queues");
     }
 
-    public void testPersistentMandatoryImmediateCombinations()
+    public void testPersistentMandatoryCombinations()
         throws IOException, InterruptedException
     {
         boolean b[] = { false, true };
         for (boolean persistent : b) {
             for (boolean mandatory : b) {
-                for (boolean immediate : b) {
-                    confirmTest("", "confirm-test",
-                                persistent, mandatory, immediate);
-                        }
+                confirmTest("", "confirm-test", persistent, mandatory);
             }
         }
     }
 
     public void testNonDurable()
         throws IOException, InterruptedException
     {
-        confirmTest("", "confirm-test-nondurable", true, false, false);
-    }
-
-    public void testImmediateNoConsumer()
-        throws IOException, InterruptedException
-    {
-        confirmTest("", "confirm-test-noconsumer", false, false, true);
-        confirmTest("", "confirm-test-noconsumer",  true, false, true);
+        confirmTest("", "confirm-test-nondurable", true, false);
     }
 
     public void testMandatoryNoRoute()
         throws IOException, InterruptedException
     {
-        confirmTest("", "confirm-test-doesnotexist", false, true, false);
-        confirmTest("", "confirm-test-doesnotexist",  true, true, false);
+        confirmTest("", "confirm-test-doesnotexist", false, true);
+        confirmTest("", "confirm-test-doesnotexist",  true, true);
     }
 
     public void testMultipleQueues()
         throws IOException, InterruptedException
     {
-        confirmTest("amq.direct", "confirm-multiple-queues",
-                    true, false, false);
+        confirmTest("amq.direct", "confirm-multiple-queues", true, false);
     }
 
     /* For testQueueDelete and testQueuePurge to be
@@ -109,7 +98,7 @@ public void testMultipleQueues()
     public void testQueueDelete()
         throws IOException, InterruptedException
     {
-        publishN("","confirm-test-noconsumer", true, false, false);
+        publishN("","confirm-test-noconsumer", true, false);
 
         channel.queueDelete("confirm-test-noconsumer");
 
@@ -119,7 +108,7 @@ public void testQueueDelete()
     public void testQueuePurge()
         throws IOException, InterruptedException
     {
-        publishN("", "confirm-test-noconsumer", true, false, false);
+        publishN("", "confirm-test-noconsumer", true, false);
 
         channel.queuePurge("confirm-test-noconsumer");
 
@@ -142,7 +131,7 @@ public void testQueueTTL()
                 Collections.singletonMap(TTL_ARG, (Object)ttl);
             channel.queueDeclare("confirm-ttl", true, true, false, argMap);
 
-            publishN("", "confirm-ttl", true, false, false);
+            publishN("", "confirm-ttl", true, false);
             channel.waitForConfirmsOrDie();
 
             channel.queueDelete("confirm-ttl");
@@ -166,7 +155,7 @@ public void testBasicRejectRequeue()
     public void testBasicRecover()
         throws IOException, InterruptedException
     {
-        publishN("", "confirm-test-noconsumer", true, false, false);
+        publishN("", "confirm-test-noconsumer", true, false);
 
         for (long i = 0; i < NUM_MESSAGES; i++) {
             GetResponse resp =
@@ -231,7 +220,7 @@ public void handleNack(long seqNo, boolean multiple) {
 
         for (long i = 0; i < NUM_MESSAGES; i++) {
             unconfirmedSet.add(channel.getNextPublishSeqNo());
-            publish("", "confirm-test", true, false, false);
+            publish("", "confirm-test", true, false);
         }
 
         channel.waitForConfirmsOrDie();
@@ -245,14 +234,14 @@ public void testWaitForConfirmsNoOp()
     {
         channel = connection.createChannel();
         // Don't enable Confirm mode
-        publish("", "confirm-test", true, false, false);
+        publish("", "confirm-test", true, false);
         channel.waitForConfirmsOrDie(); // Nop
     }
 
     public void testWaitForConfirmsException()
         throws IOException, InterruptedException
     {
-        publishN("", "confirm-test", true, false, false);
+        publishN("", "confirm-test", true, false);
         channel.close();
         try {
             channel.waitForConfirmsOrDie();
@@ -268,29 +257,27 @@ public void testWaitForConfirmsException()
 
     /* Publish NUM_MESSAGES messages and wait for confirmations. */
     public void confirmTest(String exchange, String queueName,
-                            boolean persistent, boolean mandatory,
-                            boolean immediate)
+                            boolean persistent, boolean mandatory)
         throws IOException, InterruptedException
     {
-        publishN(exchange, queueName, persistent, mandatory, immediate);
+        publishN(exchange, queueName, persistent, mandatory);
 
         channel.waitForConfirmsOrDie();
     }
 
     private void publishN(String exchangeName, String queueName,
-                          boolean persistent, boolean mandatory,
-                          boolean immediate)
+                          boolean persistent, boolean mandatory)
         throws IOException
     {
         for (long i = 0; i < NUM_MESSAGES; i++) {
-            publish(exchangeName, queueName, persistent, mandatory, immediate);
+            publish(exchangeName, queueName, persistent, mandatory);
         }
     }
 
     private void basicRejectCommon(boolean requeue)
         throws IOException
     {
-        publishN("", "confirm-test-noconsumer", true, false, false);
+        publishN("", "confirm-test-noconsumer", true, false);
 
         for (long i = 0; i < NUM_MESSAGES; i++) {
             GetResponse resp =
@@ -301,10 +288,9 @@ private void basicRejectCommon(boolean requeue)
     }
 
     protected void publish(String exchangeName, String queueName,
-                           boolean persistent, boolean mandatory,
-                           boolean immediate)
+                           boolean persistent, boolean mandatory)
         throws IOException {
-        channel.basicPublish(exchangeName, queueName, mandatory, immediate,
+        channel.basicPublish(exchangeName, queueName, mandatory, false,
                              persistent ? MessageProperties.PERSISTENT_BASIC
                                         : MessageProperties.BASIC,
                              "nop".getBytes());

test/src/com/rabbitmq/examples/TestMain.java

@@ -450,7 +450,7 @@ public void doBasicReturn(BlockingCell<Object> cell, int expectedCode) {
     }
 
     public void tryBasicReturn() throws IOException {
-        log("About to try mandatory/immediate publications");
+        log("About to try mandatory publications");
 
         String mx = "mandatoryTestExchange";
         _ch1.exchangeDeclare(mx, "fanout", false, true, null);
@@ -461,24 +461,12 @@ public void tryBasicReturn() throws IOException {
         _ch1.basicPublish(mx, "", true, false, null, "one".getBytes());
         doBasicReturn(returnCell, AMQP.NO_ROUTE);
 
-        returnCell = new BlockingCell<Object>();
-        _ch1.basicPublish(mx, "", true, true, null, "two".getBytes());
-        doBasicReturn(returnCell, AMQP.NO_ROUTE);
-
-        returnCell = new BlockingCell<Object>();
-        _ch1.basicPublish(mx, "", false, true, null, "three".getBytes());
-        doBasicReturn(returnCell, AMQP.NO_CONSUMERS);
-
         String mq = "mandatoryTestQueue";
         _ch1.queueDeclare(mq, false, false, true, null);
         _ch1.queueBind(mq, mx, "");
 
         returnCell = new BlockingCell<Object>();
-        _ch1.basicPublish(mx, "", true, true, null, "four".getBytes());
-        doBasicReturn(returnCell, AMQP.NO_CONSUMERS);
-
-        returnCell = new BlockingCell<Object>();
-        _ch1.basicPublish(mx, "", true, false, null, "five".getBytes());
+        _ch1.basicPublish(mx, "", true, false, null, "two".getBytes());
         drain(1, mq, true);
         _ch1.queueDelete(mq, true, true);
 
@@ -519,11 +507,6 @@ public void tryTransaction(String queueName) throws IOException {
         _ch1.txCommit();
         doBasicReturn(returnCell, AMQP.NO_ROUTE);
         returnCell = new BlockingCell<Object>();
-        _ch1.basicPublish("", "bogus", false, true, null, "immediate".getBytes());
-        _ch1.txCommit();
-        doBasicReturn(returnCell, AMQP.NO_CONSUMERS);
-        returnCell = new BlockingCell<Object>();
-        _ch1.txCommit();
         expect(2, drain(10, queueName, false));
 
         unsetChannelReturnListener();