merge bug23660 into default

Author: rade

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

@@ -84,7 +84,7 @@ [SetUp] public void Connect()
         {
             Connection = new ConnectionFactory().CreateConnection();
             Channel = Connection.CreateModel();
-            Queue = Channel.QueueDeclare();
+            Queue = Channel.QueueDeclare("", false, false, true, false, false, null);
         }
 
         [TearDown] public void Disconnect()
@@ -98,18 +98,15 @@ public void TestRecoverAfterCancel_()
             UTF8Encoding enc = new UTF8Encoding();
             Channel.BasicPublish("", Queue, null, enc.GetBytes("message"));
             QueueingBasicConsumer Consumer = new QueueingBasicConsumer(Channel);
-            QueueingBasicConsumer DefaultConsumer = new QueueingBasicConsumer(Channel);
-            Channel.DefaultConsumer = DefaultConsumer;
+
             String CTag = Channel.BasicConsume(Queue, null, Consumer);
             BasicDeliverEventArgs Event = (BasicDeliverEventArgs) Consumer.Queue.Dequeue();
             Channel.BasicCancel(CTag);
-            Channel.BasicRecover(false);
-
-            // The server will now redeliver us the first message again, with the
-            // same ctag, but we're not set up to handle it with a standard
-            // consumer - it should end up with the default one.
+            Channel.BasicRecover(true);
 
-            BasicDeliverEventArgs Event2 = (BasicDeliverEventArgs) DefaultConsumer.Queue.Dequeue();
+            QueueingBasicConsumer Consumer2 = new QueueingBasicConsumer(Channel);
+            Channel.BasicConsume(Queue, null, Consumer2);
+            BasicDeliverEventArgs Event2 = (BasicDeliverEventArgs)Consumer2.Queue.Dequeue();
 
             Assert.AreEqual(Event.Body, Event2.Body);
             Assert.IsFalse(Event.Redelivered);
@@ -121,7 +118,7 @@ public void TestRecoverCallback()
         {
             int callbackCount = 0;
             Channel.BasicRecoverOk += (sender, eventArgs) => callbackCount++;
-            Channel.BasicRecover(false);
+            Channel.BasicRecover(true);
             Assert.AreEqual(1, callbackCount);
         }