Move documentation to more relevant position and make test less racy

Author: Emile Joubert

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

@@ -93,8 +93,9 @@ public interface IModel: IDisposable
         ///</remarks>
         event CallbackExceptionEventHandler CallbackException;
 
-        ///<summary>Signalled when a RecoverOk is received from the
-        ///server. </summary>
+        ///<summary>All messages received before this fires that haven't been
+        ///ack'ed will be redelivered. All messages received afterwards won't
+        ///be.</summary>
         event BasicRecoverOkEventHandler BasicRecoverOk;
 
         ///<summary>Signalled when an unexpected message is delivered
@@ -630,10 +631,7 @@ void HandleBasicGetOk(ulong deliveryTag,
         void HandleBasicGetEmpty();
 
         ///<summary>Handle incoming Basic.RecoverOk methods
-        ///received in reply to Basic.Recover . All messages
-        ///received before this is invoked that haven't been
-        ///ack'ed will be redelivered. All messages received
-        ///afterwards won't be.
+        ///received in reply to Basic.Recover.
         ///</summary>
         void HandleBasicRecoverOk();
 

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

@@ -59,6 +59,7 @@
 using System;
 using System.IO;
 using System.Text;
+using System.Threading;
 using System.Collections;
 
 using RabbitMQ.Client.Impl;
@@ -117,12 +118,13 @@ public void TestRecoverAfterCancel_()
         }
 
         [Test]
-        public void TestRecoverCallback()
-        {
-            int callbackCount = 0;
-            Channel.BasicRecoverOk += (sender, eventArgs) => callbackCount++;
-            Channel.BasicRecover(false);
-            Assert.AreEqual(1, callbackCount);
+        public void TestRecoverCallback()
+        {
+            int callbackCount = 0;
+            Channel.BasicRecoverOk += (sender, eventArgs) => callbackCount++;
+            Channel.BasicRecover(false);
+            Thread.Sleep(100);
+            Assert.AreEqual(1, callbackCount);
         }
 
     }