refactor

Author: lukebakken

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

@@ -51,82 +51,87 @@ namespace RabbitMQ.Client.Unit
     [TestFixture]
     public class TestAsyncConsumer
     {
+        private static readonly byte[] body = System.Text.Encoding.UTF8.GetBytes("async-hi");
+        private static readonly ConnectionFactory cf = new ConnectionFactory { DispatchConsumersAsync = true };
+
         [Test]
         public void TestBasicRoundtrip()
         {
-            var cf = new ConnectionFactory { DispatchConsumersAsync = true };
-            using(IConnection c = cf.CreateConnection())
-            using(IModel m = c.CreateModel())
+            using (AutoResetEvent are = new AutoResetEvent(false))
             {
-                QueueDeclareOk q = m.QueueDeclare();
-                IBasicProperties bp = m.CreateBasicProperties();
-                byte[] body = System.Text.Encoding.UTF8.GetBytes("async-hi");
-                m.BasicPublish("", q.QueueName, bp, body);
-                var consumer = new AsyncEventingBasicConsumer(m);
-                var are = new AutoResetEvent(false);
-                consumer.Received += async (o, a) =>
+                using (IConnection c = cf.CreateConnection())
+                {
+                    using (IModel m = c.CreateModel())
                     {
-                        are.Set();
-                        await Task.Yield();
-                    };
-                string tag = m.BasicConsume(q.QueueName, true, consumer);
-                // ensure we get a delivery
-                bool waitRes = are.WaitOne(2000);
-                Assert.IsTrue(waitRes);
-                // unsubscribe and ensure no further deliveries
-                m.BasicCancel(tag);
-                m.BasicPublish("", q.QueueName, bp, body);
-                bool waitResFalse = are.WaitOne(2000);
-                Assert.IsFalse(waitResFalse);
+                        IBasicProperties bp = m.CreateBasicProperties();
+                        QueueDeclareOk q = m.QueueDeclare();
+                        m.BasicPublish("", q.QueueName, bp, body);
+                        var consumer = new AsyncEventingBasicConsumer(m);
+                        consumer.Received += async (o, a) =>
+                            {
+                                are.Set();
+                                await Task.Yield();
+                            };
+                        string tag = m.BasicConsume(q.QueueName, true, consumer);
+                        // ensure we get a delivery
+                        bool waitRes = are.WaitOne(2000);
+                        Assert.IsTrue(waitRes);
+                        // unsubscribe and ensure no further deliveries
+                        m.BasicCancel(tag);
+                        m.BasicPublish("", q.QueueName, bp, body);
+                        bool waitResFalse = are.WaitOne(2000);
+                        Assert.IsFalse(waitResFalse);
+                    }
+                }
             }
         }
 
         [Test]
         public void TestBasicRoundtripNoWait()
         {
-            var cf = new ConnectionFactory { DispatchConsumersAsync = true };
-            using (IConnection c = cf.CreateConnection())
+            using (AutoResetEvent are = new AutoResetEvent(false))
             {
-                using (IModel m = c.CreateModel())
+                using (IConnection c = cf.CreateConnection())
                 {
-                    QueueDeclareOk q = m.QueueDeclare();
-                    IBasicProperties bp = m.CreateBasicProperties();
-                    byte[] body = System.Text.Encoding.UTF8.GetBytes("async-hi");
-                    m.BasicPublish("", q.QueueName, bp, body);
-                    var consumer = new AsyncEventingBasicConsumer(m);
-                    var are = new AutoResetEvent(false);
-                    consumer.Received += async (o, a) =>
-                        {
-                            are.Set();
-                            await Task.Yield();
-                        };
-                    string tag = m.BasicConsume(q.QueueName, true, consumer);
-                    // ensure we get a delivery
-                    bool waitRes = are.WaitOne(5000);
-                    Assert.IsTrue(waitRes);
-                    // unsubscribe and ensure no further deliveries
-                    m.BasicCancelNoWait(tag);
-                    Thread.Sleep(1000);
-                    m.BasicPublish("", q.QueueName, bp, body);
-                    bool waitResFalse = are.WaitOne(5000);
-                    Assert.IsFalse(waitResFalse);
+                    using (IModel m = c.CreateModel())
+                    {
+                        IBasicProperties bp = m.CreateBasicProperties();
+                        QueueDeclareOk q = m.QueueDeclare();
+                        m.BasicPublish("", q.QueueName, bp, body);
+                        var consumer = new AsyncEventingBasicConsumer(m);
+                        consumer.Received += async (o, a) =>
+                            {
+                                are.Set();
+                                await Task.Yield();
+                            };
+                        string tag = m.BasicConsume(q.QueueName, true, consumer);
+                        // ensure we get a delivery
+                        bool waitRes = are.WaitOne(2000);
+                        Assert.IsTrue(waitRes);
+                        // unsubscribe and ensure no further deliveries
+                        m.BasicCancelNoWait(tag);
+                        Thread.Sleep(1000);
+                        m.BasicPublish("", q.QueueName, bp, body);
+                        bool waitResFalse = are.WaitOne(2000);
+                        Assert.IsFalse(waitResFalse);
+                    }
                 }
             }
         }
 
         [Test]
         public void NonAsyncConsumerShouldThrowInvalidOperationException()
         {
-            var cf = new ConnectionFactory{ DispatchConsumersAsync = true };
-            using(IConnection c = cf.CreateConnection())
-            using(IModel m = c.CreateModel())
+            using (IConnection c = cf.CreateConnection())
             {
-                QueueDeclareOk q = m.QueueDeclare();
-                IBasicProperties bp = m.CreateBasicProperties();
-                byte[] body = System.Text.Encoding.UTF8.GetBytes("async-hi");
-                m.BasicPublish("", q.QueueName, bp, body);
-                var consumer = new EventingBasicConsumer(m);
-                Assert.Throws<InvalidOperationException>(() => m.BasicConsume(q.QueueName, false, consumer));
+                using (IModel m = c.CreateModel())
+                {
+                    IBasicProperties bp = m.CreateBasicProperties();
+                    QueueDeclareOk q = m.QueueDeclare();
+                    m.BasicPublish("", q.QueueName, bp, body);
+                    var consumer = new EventingBasicConsumer(m);
+                    Assert.Throws<InvalidOperationException>(() => m.BasicConsume(q.QueueName, false, consumer));
+                }
             }
         }
     }