* Test fixes

* Implement GetHashCode and Equals when AmqpString has only memory in it.

Author: lukebakken

projects/RabbitMQ.Client/client/api/AmqpString.cs

@@ -157,19 +157,19 @@ public bool Equals(AmqpString other)
         {
             if (_value == null)
             {
-                throw new InvalidOperationException("TODO");
+                return _stringBytes.Equals(other._stringBytes);
             }
             else
             {
-                return _value == other._value;
+                return _value.Equals(other._value);
             }
         }
 
         public override int GetHashCode()
         {
             if (_value == null)
             {
-                throw new InvalidOperationException("TODO");
+                return _stringBytes.GetHashCode();
             }
             else
             {

projects/RabbitMQ.Client/client/framing/BasicCancel.cs

@@ -61,5 +61,11 @@ public int GetRequiredBufferSize()
             bufferSize += _consumerTag.Length; // _consumerTag in bytes
             return bufferSize;
         }
+
+        public static ConsumerTag GetConsumerTag(ReadOnlyMemory<byte> data)
+        {
+            WireFormatting.ReadShortMemory(data, out ReadOnlyMemory<byte> consumerTagMemory);
+            return new ConsumerTag(consumerTagMemory);
+        }
     }
 }

projects/RabbitMQ.Client/client/impl/ChannelBase.cs

@@ -655,7 +655,7 @@ protected async Task<bool> HandleBasicCancelAsync(IncomingCommand cmd, Cancellat
         {
             try
             {
-                ConsumerTag consumerTag = new ConsumerTag(cmd.MethodMemory);
+                ConsumerTag consumerTag = BasicCancel.GetConsumerTag(cmd.MethodMemory);
                 await ConsumerDispatcher.HandleBasicCancelAsync(consumerTag, cancellationToken)
                     .ConfigureAwait(false);
                 return true;

projects/RabbitMQ.Client/client/impl/ConsumerDispatching/ConsumerDispatcherBase.cs

@@ -45,10 +45,15 @@ public IBasicConsumer GetAndRemoveConsumer(ConsumerTag tag)
         {
             lock (_consumers)
             {
-                IBasicConsumer result = _consumers.Remove((ReadOnlyMemory<byte>)tag,
-                    out (IBasicConsumer consumer, ConsumerTag consumerTag) consumerPair) ?
-                        consumerPair.consumer : GetDefaultOrFallbackConsumer();
-                return result;
+                var tagMem = (ReadOnlyMemory<byte>)tag;
+                if (_consumers.Remove(tagMem, out (IBasicConsumer consumer, ConsumerTag consumerTag) consumerPair))
+                {
+                    return consumerPair.consumer;
+                }
+                else
+                {
+                    return GetDefaultOrFallbackConsumer();
+                }
             }
         }
 

projects/Test/Integration/TestConsumerCancelNotify.cs

@@ -50,7 +50,7 @@ public TestConsumerCancelNotify(ITestOutputHelper output) : base(output)
         [Fact]
         public Task TestConsumerCancelNotification()
         {
-            return TestConsumerCancelAsync("queue_consumer_cancel_notify", false);
+            return TestConsumerCancelAsync(GenerateQueueName(), false);
         }
 
         [Fact]
@@ -86,11 +86,11 @@ public async Task TestCorrectConsumerTag()
             await _channel.QueueDeleteAsync(q2);
         }
 
-        private async Task TestConsumerCancelAsync(string queue, bool eventMode)
+        private async Task TestConsumerCancelAsync(QueueName queue, bool eventMode)
         {
             await _channel.QueueDeclareAsync(queue, false, true, false);
             IBasicConsumer consumer = new CancelNotificationConsumer(_channel, this, eventMode);
-            string actualConsumerTag = await _channel.BasicConsumeAsync(queue, false, consumer);
+            ConsumerTag actualConsumerTag = await _channel.BasicConsumeAsync(queue, false, consumer);
 
             await _channel.QueueDeleteAsync(queue);
             await WaitAsync(_tcs, "HandleBasicCancel / Cancelled event");