Use Model.WaitForConfirms() where appropriate

Author: Emile Joubert

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

@@ -54,17 +54,15 @@ public class TestComplexResults : IntegrationFixture
         [Test]
         public void TestQueueDeclareOk()
         {
-            AutoResetEvent excl = new AutoResetEvent(false);
             Model.ConfirmSelect();
-            Model.BasicAcks += delegate { excl.Set(); };
             QueueDeclareOk result;
 
             result = QueueDeclare();
             Assert.AreEqual(0, result.MessageCount);
             Assert.AreEqual(0, result.ConsumerCount);
             Assert.AreEqual(QueueName, result.QueueName);
             Model.BasicPublish("", result.QueueName, null, new byte[] { });
-            excl.WaitOne();
+            Model.WaitForConfirms();
 
             result = QueueDeclare();
             Assert.AreEqual(1, result.MessageCount);

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

@@ -50,9 +50,7 @@ public class TestExtensions : IntegrationFixture
         [Test]
         public void TestExchangeBinding()
         {
-            AutoResetEvent excl = new AutoResetEvent(false);
             Model.ConfirmSelect();
-            Model.BasicAcks += delegate { excl.Set(); };
 
             Model.ExchangeDeclare("src", ExchangeType.Direct, false, false, null);
             Model.ExchangeDeclare("dest", ExchangeType.Direct, false, false, null);
@@ -62,12 +60,12 @@ public void TestExchangeBinding()
             Model.QueueBind(queue, "dest", String.Empty);
 
             Model.BasicPublish("src", String.Empty, null, new byte[] { });
-            excl.WaitOne();
+            Model.WaitForConfirms();
             Assert.IsNotNull(Model.BasicGet(queue, true));
 
             Model.ExchangeUnbind("dest", "src", String.Empty);
             Model.BasicPublish("src", String.Empty, null, new byte[] { });
-            excl.WaitOne();
+            Model.WaitForConfirms();
             Assert.IsNull(Model.BasicGet(queue, true));
 
             Model.ExchangeDelete("src");