Merge pull request #4018 from Sergio0694/bugfix/messenger-tests

Improve Messenger tests

Author: michael-hawker

Microsoft.Toolkit.Mvvm/Messaging/Messages/AsyncCollectionRequestMessage{T}.cs

@@ -104,7 +104,7 @@ public async Task<IReadOnlyCollection<T>> GetResponsesAsync(CancellationToken ca
 
             List<T> results = new(this.responses.Count);
 
-            await foreach (var response in this.WithCancellation(cancellationToken))
+            await foreach (var response in this.WithCancellation(cancellationToken).ConfigureAwait(false))
             {
                 results.Add(response);
             }

UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Toolkit.Mvvm.Messaging;
 using Microsoft.Toolkit.Mvvm.Messaging.Messages;
@@ -73,6 +74,8 @@ void Receive(object recipient, NumberRequestMessage m)
             messenger.Register<NumberRequestMessage>(recipient, Receive);
 
             int result = messenger.Send<NumberRequestMessage>();
+
+            GC.KeepAlive(recipient);
         }
 
         public class NumberRequestMessage : RequestMessage<int>
@@ -102,6 +105,8 @@ void Receive(object recipient, AsyncNumberRequestMessage m)
             int result = await messenger.Send<AsyncNumberRequestMessage>();
 
             Assert.AreEqual(result, 42);
+
+            GC.KeepAlive(recipient);
         }
 
         [TestCategory("Mvvm")]
@@ -134,6 +139,8 @@ void Receive(object recipient, AsyncNumberRequestMessage m)
             int result = await messenger.Send<AsyncNumberRequestMessage>();
 
             Assert.AreEqual(result, 42);
+
+            GC.KeepAlive(recipient);
         }
 
         [TestCategory("Mvvm")]
@@ -167,6 +174,8 @@ void Receive(object recipient, AsyncNumberRequestMessage m)
             messenger.Register<AsyncNumberRequestMessage>(recipient, Receive);
 
             int result = await messenger.Send<AsyncNumberRequestMessage>();
+
+            GC.KeepAlive(recipient);
         }
 
         public class AsyncNumberRequestMessage : AsyncRequestMessage<int>
@@ -191,6 +200,8 @@ void Receive(object recipient, NumbersCollectionRequestMessage m)
             var results = messenger.Send<NumbersCollectionRequestMessage>().Responses;
 
             Assert.AreEqual(results.Count, 0);
+
+            GC.KeepAlive(recipient);
         }
 
         [TestCategory("Mvvm")]
@@ -266,6 +277,8 @@ void Receive(object recipient, AsyncNumbersCollectionRequestMessage m)
             var results = await messenger.Send<AsyncNumbersCollectionRequestMessage>().GetResponsesAsync();
 
             Assert.AreEqual(results.Count, 0);
+
+            GC.KeepAlive(recipient);
         }
 
         [TestCategory("Mvvm")]
@@ -298,6 +311,46 @@ async Task<int> GetNumberAsync()
             messenger.Register<AsyncNumbersCollectionRequestMessage>(recipient3, Receive3);
             messenger.Register<AsyncNumbersCollectionRequestMessage>(recipient4, Receive4);
 
+            var responses = await messenger.Send<AsyncNumbersCollectionRequestMessage>().GetResponsesAsync();
+
+            CollectionAssert.AreEquivalent(responses.ToArray(), new[] { 1, 2, 3, 3 });
+
+            GC.KeepAlive(recipient1);
+            GC.KeepAlive(recipient2);
+            GC.KeepAlive(recipient3);
+            GC.KeepAlive(recipient4);
+        }
+
+        [TestCategory("Mvvm")]
+        [TestMethod]
+        [DataRow(typeof(StrongReferenceMessenger))]
+        [DataRow(typeof(WeakReferenceMessenger))]
+        public async Task Test_Messenger_AsyncCollectionRequestMessage_Ok_MultipleReplies_Enumerate(Type type)
+        {
+            var messenger = (IMessenger)Activator.CreateInstance(type);
+            object
+                recipient1 = new object(),
+                recipient2 = new object(),
+                recipient3 = new object(),
+                recipient4 = new object();
+
+            async Task<int> GetNumberAsync()
+            {
+                await Task.Delay(100);
+
+                return 3;
+            }
+
+            void Receive1(object recipient, AsyncNumbersCollectionRequestMessage m) => m.Reply(1);
+            void Receive2(object recipient, AsyncNumbersCollectionRequestMessage m) => m.Reply(Task.FromResult(2));
+            void Receive3(object recipient, AsyncNumbersCollectionRequestMessage m) => m.Reply(GetNumberAsync());
+            void Receive4(object recipient, AsyncNumbersCollectionRequestMessage m) => m.Reply(_ => GetNumberAsync());
+
+            messenger.Register<AsyncNumbersCollectionRequestMessage>(recipient1, Receive1);
+            messenger.Register<AsyncNumbersCollectionRequestMessage>(recipient2, Receive2);
+            messenger.Register<AsyncNumbersCollectionRequestMessage>(recipient3, Receive3);
+            messenger.Register<AsyncNumbersCollectionRequestMessage>(recipient4, Receive4);
+
             List<int> responses = new List<int>();
 
             await foreach (var response in messenger.Send<AsyncNumbersCollectionRequestMessage>())
@@ -306,6 +359,11 @@ async Task<int> GetNumberAsync()
             }
 
             CollectionAssert.AreEquivalent(responses, new[] { 1, 2, 3, 3 });
+
+            GC.KeepAlive(recipient1);
+            GC.KeepAlive(recipient2);
+            GC.KeepAlive(recipient3);
+            GC.KeepAlive(recipient4);
         }
 
         public class AsyncNumbersCollectionRequestMessage : AsyncCollectionRequestMessage<int>