* Fix test

* Remove more commented-out code

Author: lukebakken

projects/RabbitMQ.Client/Impl/ChannelBase.cs

@@ -1777,7 +1777,7 @@ await ModelSendAsync(in method, k.CancellationToken)
 
         // NOTE: this method is internal for its use in this test:
         // TestWaitForConfirmsWithTimeoutAsync_MessageNacked_WaitingHasTimedout_ReturnFalse
-        internal async Task HandleAckNack(ulong deliveryTag, bool multiple, bool isNack, CancellationToken cancellationToken = default)
+        private async Task HandleAckNack(ulong deliveryTag, bool multiple, bool isNack, CancellationToken cancellationToken = default)
         {
             // Only do this if confirms are enabled *and* the library is tracking confirmations
             if (_publisherConfirmationsEnabled && _publisherConfirmationTrackingEnabled)

projects/Test/Common/TestConnectionRecoveryBase.cs

@@ -78,7 +78,6 @@ await WithTemporaryNonExclusiveQueueAsync(ch, async (_, q) =>
                 string rk = "routing-key";
                 await ch.QueueBindAsync(q, x, rk);
                 await ch.BasicPublishAsync(x, rk, _messageBody);
-                // Assert.True(await WaitForConfirmsWithCancellationAsync(ch));
                 await ch.ExchangeDeclarePassiveAsync(x);
             });
         }
@@ -90,16 +89,13 @@ protected Task AssertExclusiveQueueRecoveryAsync(IChannel m, string q)
 
         protected async Task AssertQueueRecoveryAsync(IChannel ch, string q, bool exclusive, IDictionary<string, object> arguments = null)
         {
-            // Note: no need to enable publisher confirmations as they are
-            // automatically enabled for channels
-            await ch.QueueDeclareAsync(queue: q, passive: true, durable: false, exclusive: false, autoDelete: false, arguments: null);
+            await ch.QueueDeclarePassiveAsync(q);
 
             RabbitMQ.Client.QueueDeclareOk ok1 = await ch.QueueDeclareAsync(queue: q, passive: false,
                 durable: false, exclusive: exclusive, autoDelete: false, arguments: arguments);
             Assert.Equal(0u, ok1.MessageCount);
 
             await ch.BasicPublishAsync("", q, _messageBody);
-            // Assert.True(await WaitForConfirmsWithCancellationAsync(ch));
 
             RabbitMQ.Client.QueueDeclareOk ok2 = await ch.QueueDeclareAsync(queue: q, passive: false,
                 durable: false, exclusive: exclusive, autoDelete: false, arguments: arguments);

projects/Test/Integration/ConnectionRecovery/TestConnectionRecovery.cs

@@ -96,7 +96,7 @@ await _channel.ExchangeDeclareAsync(exchange: exchangeName,
             consumer.ReceivedAsync += MessageReceived;
             await _channel.BasicConsumeAsync(queueName, true, consumer);
 
-            await using (IChannel pubCh = await _conn.CreateChannelAsync())
+            await using (IChannel pubCh = await _conn.CreateChannelAsync(publisherConfirmationsEnabled: true, publisherConfirmationTrackingEnabled: true))
             {
                 await pubCh.BasicPublishAsync(exchange: exchangeName, routingKey: routingKey, body: body);
                 await pubCh.CloseAsync();
@@ -106,7 +106,7 @@ await _channel.ExchangeDeclareAsync(exchange: exchangeName,
 
             await CloseAndWaitForRecoveryAsync();
 
-            await using (IChannel pubCh = await _conn.CreateChannelAsync())
+            await using (IChannel pubCh = await _conn.CreateChannelAsync(publisherConfirmationsEnabled: true, publisherConfirmationTrackingEnabled: true))
             {
                 await pubCh.BasicPublishAsync(exchange: exchangeName, routingKey: "unused", body: body);
                 await pubCh.CloseAsync();

projects/Test/Integration/TestAsyncEventingBasicConsumer.cs

@@ -105,7 +105,7 @@ public async Task TestAsyncEventingBasicConsumer_GH1038()
             await _channel.BasicConsumeAsync(queueName, false, consumer);
 
             //publisher
-            await using IChannel publisherChannel = await _conn.CreateChannelAsync();
+            await using IChannel publisherChannel = await _conn.CreateChannelAsync(publisherConfirmationsEnabled: true, publisherConfirmationTrackingEnabled: true);
             byte[] messageBodyBytes = System.Text.Encoding.UTF8.GetBytes("Hello, world!");
             var props = new BasicProperties();
             await publisherChannel.BasicPublishAsync(exchange: exchangeName, routingKey: string.Empty,

projects/Test/Integration/TestConnectionTopologyRecovery.cs

@@ -104,7 +104,7 @@ public async Task TestTopologyRecoveryQueueFilter()
                 tcs.SetResult(true);
                 return Task.CompletedTask;
             };
-            IChannel ch = await conn.CreateChannelAsync();
+            IChannel ch = await conn.CreateChannelAsync(publisherConfirmationsEnabled: true, publisherConfirmationTrackingEnabled: true);
 
             await ch.QueueDeclareAsync(queueToRecover, false, false, false);
             await ch.QueueDeclareAsync(queueToIgnore, false, false, false);

projects/Test/Integration/TestExtensions.cs

@@ -43,16 +43,6 @@ public TestExtensions(ITestOutputHelper output) : base(output)
         {
         }
 
-        [Fact]
-        public async Task TestConfirmBarrier()
-        {
-            for (int i = 0; i < 10; i++)
-            {
-                await _channel.BasicPublishAsync(string.Empty, string.Empty, Array.Empty<byte>());
-            }
-            // Assert.True(await _channel.WaitForConfirmsAsync());
-        }
-
         [Fact]
         public async Task TestExchangeBinding()
         {

projects/Test/Integration/TestPublisherConfirms.cs

@@ -29,7 +29,6 @@
 //  Copyright (c) 2007-2024 Broadcom. All Rights Reserved.
 //---------------------------------------------------------------------------
 
-using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
@@ -103,31 +102,5 @@ await ch.QueueDeclareAsync(queue: queueName, passive: false, durable: false,
                 await ch.CloseAsync();
             }
         }
-
-        private async Task TestWaitForConfirmsAsync(int numberOfMessagesToPublish, Func<IChannel, Task> fn)
-        {
-            string queueName = GenerateQueueName();
-            await using IChannel ch = await _conn.CreateChannelAsync(publisherConfirmationsEnabled: true, publisherConfirmationTrackingEnabled: true);
-            var props = new BasicProperties { Persistent = true };
-
-            await ch.QueueDeclareAsync(queue: queueName, passive: false, durable: false,
-                exclusive: true, autoDelete: false, arguments: null);
-
-            for (int i = 0; i < numberOfMessagesToPublish; i++)
-            {
-                await ch.BasicPublishAsync(exchange: string.Empty, routingKey: queueName,
-                    body: _messageBody, mandatory: true, basicProperties: props);
-            }
-
-            try
-            {
-                await fn(ch);
-            }
-            finally
-            {
-                await ch.QueueDeleteAsync(queue: queueName, ifUnused: false, ifEmpty: false);
-                await ch.CloseAsync();
-            }
-        }
     }
 }