Fix ExpectAsync(0) implementation (#4782)

* Added failing spec * Fixed assertion Co-authored-by: Aaron Stannard <aaron@petabridge.com>
akkadotnet · Feb 12, 2021 · 179b916 · 179b916
1 parent a6ea829
commit 179b916
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/src/core/Akka.TestKit.Tests/TestEventListenerTests/AllTestForEventFilterBase.cs b/src/core/Akka.TestKit.Tests/TestEventListenerTests/AllTestForEventFilterBase.cs
@@ -150,6 +150,26 @@ public void Expect_0_events_Should_work()
             }).Should().Throw<Exception>("Expected 0 events");
         }
 
+        [Fact]
+        public async Task ExpectAsync_0_events_Should_work()
+        {
+            Exception ex = null;
+            try
+            {
+                await EventFilter.Error().ExpectAsync(0, async () =>
+                {
+                    await Task.Delay(100); // bug only happens when error is not logged instantly
+                    Log.Error("something");
+                });
+            }
+            catch (Exception e)
+            {
+                ex = e;
+            }
+
+            ex.Should().NotBeNull("Expected 0 errors logged, but there are error logs");
+        }
+
         [Fact]
         public void Messages_can_be_muted()
         {

diff --git a/src/core/Akka.TestKit/EventFilter/Internal/EventFilterApplier.cs b/src/core/Akka.TestKit/EventFilter/Internal/EventFilterApplier.cs
@@ -421,8 +421,17 @@ protected async Task<bool> AwaitDoneAsync(TimeSpan timeout, int? expectedOccurre
             if(expectedOccurrences.HasValue)
             {
                 var expected = expectedOccurrences.GetValueOrDefault();
-                await _testkit.AwaitConditionNoThrowAsync(() => matchedEventHandler.ReceivedCount >= expected, timeout);
-                return matchedEventHandler.ReceivedCount == expected;
+                if (expected > 0)
+                {
+                    await _testkit.AwaitConditionNoThrowAsync(() => matchedEventHandler.ReceivedCount >= expected, timeout);
+                    return matchedEventHandler.ReceivedCount == expected;
+                }
+                else
+                {
+                    // if expecting no events to arrive - assert that given condition will never match
+                    var foundEvent = await _testkit.AwaitConditionNoThrowAsync(() => matchedEventHandler.ReceivedCount > 0, timeout);
+                    return foundEvent == false;
+                }
             }
             return true;
         }