Close subscriptions at the end of drain run, increase concurrency

Author: michaelklishin

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

@@ -124,7 +124,7 @@ public void Drain()
                 #pragma warning disable 0168
                 try
                 {
-                    for(int i = 0; i < 1000; i++)
+                    for(int i = 0; i < 100; i++)
                     {
                         BasicDeliverEventArgs ea = m_subscription.Next();
                         if(ea != null)
@@ -139,10 +139,12 @@ public void Drain()
                 } catch (AlreadyClosedException ace)
                 {
                     // expected
+                } finally
+                {
+                    m_subscription.Close();
                 }
                 #pragma warning restore
 
-                m_subscription.Close();
             }
 
             protected void PostProcess()
@@ -181,7 +183,7 @@ protected void TestConcurrentIterationWithDrainer(bool ack)
             PreparedQueue(q);
 
             List<Thread> ts = new List<Thread>();
-            for (int i = 0; i < 10; i++)
+            for (int i = 0; i < 50; i++)
             {
                 SubscriptionDrainer drainer = new SubscriptionDrainer(sub, ack);
                 Thread t = new Thread(drainer.Drain);