[TEST] Change Within methods to async

src/core/Akka.TestKit.Tests/TestKitBaseTests/WithinTests.cs

@@ -6,7 +6,13 @@
 //-----------------------------------------------------------------------
 
 using System;
+using System.Threading.Tasks;
+using FluentAssertions;
+using FluentAssertions.Execution;
+using FluentAssertions.Extensions;
 using Xunit;
+using Xunit.Sdk;
+using static FluentAssertions.FluentActions;
 
 namespace Akka.TestKit.Tests.TestKitBaseTests
 {
@@ -17,5 +23,45 @@ public void Within_should_increase_max_timeout_by_the_provided_epsilon_value()
         {
             Within(TimeSpan.FromSeconds(1), () => ExpectNoMsg(), TimeSpan.FromMilliseconds(50));
         }
+
+        [Fact]
+        public void Within_should_respect_minimum_time()
+        {
+            Within(0.3.Seconds(), 1.Seconds(), () => ExpectNoMsg(0.4.Seconds()), "", 0.1.Seconds());
+        }
+
+        [Fact]
+        public async Task WithinAsync_should_respect_minimum_time()
+        {
+            await WithinAsync(
+                0.3.Seconds(),
+                1.Seconds(),
+                async () => await ExpectNoMsgAsync(0.4.Seconds()), 
+                "", 
+                0.1.Seconds());
+        }
+
+        [Fact]
+        public void Within_should_throw_if_execution_is_shorter_than_minimum_time()
+        {
+            Invoking(() =>
+            {
+                Within(0.5.Seconds(), 1.Seconds(), () => ExpectNoMsg(0.1.Seconds()), null, 0.1.Seconds());
+            }).Should().Throw<XunitException>();
+        }
+
+        [Fact]
+        public async Task WithinAsync_should_throw_if_execution_is_shorter_than_minimum_time()
+        {
+            await Awaiting(async () =>
+            {
+                await WithinAsync(
+                    0.5.Seconds(),
+                    1.Seconds(),
+                    async () => await ExpectNoMsgAsync(0.1.Seconds()),
+                    null,
+                    0.1.Seconds());
+            }).Should().ThrowAsync<XunitException>();
+        }
     }
 }

src/core/Akka.TestKit/TestKitBase.cs

@@ -364,7 +364,7 @@ public void SetAutoPilot(AutoPilot pilot)
         /// <summary>
         /// <para>
         /// Retrieves the time remaining for execution of the innermost enclosing
-        /// <see cref="Within(TimeSpan, Action, TimeSpan?)">Within</see> block.
+        /// <see cref="Within(TimeSpan, Action, TimeSpan?, CancellationToken)">Within</see> block.
         /// If missing that, then it returns the properly dilated default for this
         /// case from settings (key: "akka.test.single-expect-default").
         /// </para>
@@ -378,7 +378,7 @@ public TimeSpan RemainingOrDefault
         /// <summary>
         /// <para>
         /// Retrieves the time remaining for execution of the innermost enclosing
-        /// <see cref="Within(TimeSpan, Action, TimeSpan?)">Within</see> block.
+        /// <see cref="Within(TimeSpan, Action, TimeSpan?, CancellationToken)">Within</see> block.
         /// </para>
         /// <remarks>The returned value is always finite.</remarks>
         /// </summary>

src/core/Akka.TestKit/TestKitBase_AwaitAssert.cs

@@ -35,8 +35,8 @@ public abstract partial class TestKitBase
         /// <param name="cancellationToken"></param>
         public void AwaitAssert(Action assertion, TimeSpan? duration=null, TimeSpan? interval=null, CancellationToken cancellationToken = default)
         {
-            var task = AwaitAssertAsync(assertion, duration, interval, cancellationToken);
-            task.WaitAndUnwrapException();
+            AwaitAssertAsync(assertion, duration, interval, cancellationToken)
+                .WaitAndUnwrapException();
         }
 
         /// <inheritdoc cref="AwaitAssert(Action, TimeSpan?, TimeSpan?, CancellationToken)"/>
@@ -53,6 +53,7 @@ public async Task AwaitAssertAsync(Action assertion, TimeSpan? duration=null, Ti
                 cancellationToken.ThrowIfCancellationRequested();
                 try
                 {
+                    // TODO: assertion can run forever, need a way to stop this if this happens.
                     assertion();
                     return;
                 }