merge default into bug26097

Author: michaelklishin

projects/client/RabbitMQ.Client/src/client/messagepatterns/Subscription.cs

@@ -175,15 +175,13 @@ public void Ack()
         }
 
         ///<summary>If we are not in "noAck" mode, calls
-        ///IModel.BasicAck with the delivery-tag from the passed in
-        ///event; otherwise, sends nothing to the server. In both
-        ///cases, if the passed-in event is the same as LatestEvent
-        ///(by pointer comparison), sets LatestEvent to
-        ///null.</summary>
+        ///IModel.BasicAck with the delivery-tag from <paramref name="evt"/>;
+        ///otherwise, sends nothing to the server. if <paramref name="evt"/> is the same as LatestEvent
+        ///by pointer comparison, sets LatestEvent to null.
+        ///</summary>
         ///<remarks>
-        /// Make sure that this method is only called with events that
-        /// originated from this Subscription - other usage will have
-        /// unpredictable results.
+        ///Passing an event that did not originate with this Subscription's
+        /// channel, will lead to unpredictable behaviour
         ///</remarks>
         public void Ack(BasicDeliverEventArgs evt)
         {
@@ -200,6 +198,53 @@ public void Ack(BasicDeliverEventArgs evt)
             }
         }
 
+        ///<summary>If LatestEvent is non-null, passes it to
+        ///Nack(BasicDeliverEventArgs, false, requeue). Causes LatestEvent to become
+        ///null.</summary>
+        public void Nack(bool requeue)
+        {
+            if (m_latestEvent != null) {
+                Nack(m_latestEvent, false, requeue);
+            }
+        }
+
+
+        ///<summary>If LatestEvent is non-null, passes it to
+        ///Nack(BasicDeliverEventArgs, multiple, requeue). Causes LatestEvent to become
+        ///null.</summary>
+        public void Nack(bool multiple, bool requeue)
+        {
+            if (m_latestEvent != null) {
+                Nack(m_latestEvent, multiple, requeue);
+            }
+        }
+
+        ///<summary>If we are not in "noAck" mode, calls
+        ///IModel.BasicNack with the delivery-tag from <paramref name="evt"/>;
+        ///otherwise, sends nothing to the server. if <paramref name="evt"/> is the same as LatestEvent
+        ///by pointer comparison, sets LatestEvent to null.
+        ///</summary>
+        ///<remarks>
+        ///Passing an event that did not originate with this Subscription's
+        /// channel, will lead to unpredictable behaviour
+        ///</remarks>
+        public void Nack(BasicDeliverEventArgs evt,
+                         bool multiple,
+                         bool requeue)
+        {
+            if (evt == null) {
+                return;
+            }
+
+            if (!m_noAck) {
+                m_model.BasicNack(evt.DeliveryTag, multiple, requeue);
+            }
+
+            if (evt == m_latestEvent) {
+                m_latestEvent = null;
+            }
+        }
+
         ///<summary>Retrieves the next incoming delivery in our
         ///subscription queue.</summary>
         ///<remarks>

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

@@ -75,5 +75,35 @@ public void TestChannelClosureIsObservableOnSubscription()
             BasicDeliverEventArgs r3;
             Assert.IsFalse(sub.Next(100, out r3));
         }
+
+        [Test]
+        public void TestSubscriptionAck()
+        {
+            Model.BasicQos(0, 1, false);
+            string q = Model.QueueDeclare();
+            Subscription sub = new Subscription(Model, q, false);
+
+            Model.BasicPublish("", q, null, enc.GetBytes("a message"));
+            BasicDeliverEventArgs res = sub.Next();
+            Assert.IsNotNull(res);
+            sub.Ack();
+            QueueDeclareOk ok = Model.QueueDeclarePassive(q);
+            Assert.AreEqual(0, ok.MessageCount);
+        }
+
+        [Test]
+        public void TestSubscriptionNack()
+        {
+            Model.BasicQos(0, 1, false);
+            string q = Model.QueueDeclare();
+            Subscription sub = new Subscription(Model, q, false);
+
+            Model.BasicPublish("", q, null, enc.GetBytes("a message"));
+            BasicDeliverEventArgs res = sub.Next();
+            Assert.IsNotNull(res);
+            sub.Nack(false, false);
+            QueueDeclareOk ok = Model.QueueDeclarePassive(q);
+            Assert.AreEqual(0, ok.MessageCount);
+        }
     }
 }