Add tests and simple queue and exchange delete methods

Author: Emile Joubert

projects/client/RabbitMQ.Client/src/client/api/IModel.cs

@@ -181,6 +181,10 @@ void ExchangeDelete(string exchange,
                             [AmqpNowaitArgument(null)]
                             bool nowait);
 
+        ///<summary>(Spec method) Delete an exchange.</summary>
+        [AmqpMethodDoNotImplement(null)]
+        void ExchangeDelete(string exchange);
+
         ///<summary>(Spec method) Declare a queue.</summary>
         ///<remarks>
         ///The queue is declared non-passive, non-durable,
@@ -260,6 +264,15 @@ uint QueueDelete(string queue,
                          [AmqpNowaitArgument(null, "0xFFFFFFFF")]
                          bool nowait);
 
+        ///<summary>(Spec method) Delete a queue.</summary>
+        ///<remarks>
+        ///Returns the number of messages purged during queue
+        ///deletion.
+        ///</remarks>
+        [AmqpMethodDoNotImplement(null)]
+        [return: AmqpFieldMapping(null, "messageCount")]
+        uint QueueDelete(string queue);
+
         ///<summary>Start a Basic content-class consumer.</summary>
         ///<remarks>
         ///The consumer is started with noAck=false (i.e. BasicAck is required),

projects/client/RabbitMQ.Client/src/client/impl/ModelBase.cs

@@ -533,6 +533,11 @@ public abstract void ExchangeDelete(string exchange,
                                             bool ifUnused,
                                             bool nowait);
 
+        public void ExchangeDelete(string exchange)
+        {
+            ExchangeDelete(exchange, false, false);
+        }
+
         //TODO: Mark these as virtual, maybe the model has an optimized way
         //      of dealing with missing parameters.
         public string QueueDeclare()
@@ -542,7 +547,7 @@ public string QueueDeclare()
 
         public string QueueDeclare(string queue)
         {
-            return _Private_QueueDeclare(queue, true, false, false, false, false, null);
+            return _Private_QueueDeclare(queue, false, false, false, false, false, null);
         }
 
         public string QueueDeclarePassive(string queue)
@@ -588,6 +593,11 @@ public abstract uint QueueDelete(string queue,
                                          bool ifEmpty,
                                          bool nowait);
 
+        public uint QueueDelete(string queue)
+        {
+            return QueueDelete(queue, false, false, false);
+        }
+
         public string BasicConsume(string queue,
                                    IDictionary filter,
                                    IBasicConsumer consumer)

projects/client/Unit/src/unit/TestPassiveDeclare.cs

@@ -54,6 +54,7 @@
 //   Contributor(s): ______________________________________.
 //
 //---------------------------------------------------------------------------
+using System.Collections;
 using NUnit.Framework;
 using RabbitMQ.Client;
 using RabbitMQ.Client.Exceptions;
@@ -92,6 +93,21 @@ public void TestExchangePassiveDeclare()
             catch (OperationInterruptedException) { }
         }
 
+        [Test]
+        public void TestExchangePassiveDeclareBeforeAndAfterDelete()
+        {
+            string exchangeName = GetType().FullName;
+            ch.ExchangeDeclare(exchangeName, "direct", true);
+            ch.ExchangeDeclarePassive(exchangeName);
+            ch.ExchangeDelete(exchangeName);
+            try
+            {
+                ch.ExchangeDeclarePassive(exchangeName);
+                Assert.Fail("Passive declare of a deleted exchange should fail");
+            }
+            catch (OperationInterruptedException) { }
+        }
+
         [Test]
         public void TestQueuePassiveDeclare()
         {
@@ -102,5 +118,35 @@ public void TestQueuePassiveDeclare()
             }
             catch (OperationInterruptedException) { }
         }
+
+        [Test]
+        public void TestServerNamedQueueDeclare()
+        {
+            string queueName = ch.QueueDeclare();
+            Assert.AreEqual(queueName, ch.QueueDeclarePassive(queueName));
+        }
+
+        [Test]
+        public void TestQueueDeclare()
+        {
+            string queueName = GetType().FullName;
+            string queueNameServer = ch.QueueDeclare(
+                queueName, true, true, true, new Hashtable());
+            Assert.AreEqual(queueName, queueNameServer);
+            Assert.AreEqual(queueName, ch.QueueDeclarePassive(queueName));
+        }
+
+        [Test]
+        public void TestQueueDeclareAfterDelete()
+        {
+            try
+            {
+                string queueName = ch.QueueDeclare();
+                Assert.AreEqual(0, ch.QueueDelete(queueName));
+                ch.QueueDeclarePassive(queueName);
+                Assert.Fail("Passive declare of an unknown queue should fail");
+            }
+            catch (OperationInterruptedException) { }
+        }
     }
 }