feat: support Within in verification expectations

Directory.Packages.props

@@ -4,8 +4,9 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageVersion Include="aweXpect" Version="2.30.0" />
-		<PackageVersion Include="aweXpect.Core" Version="2.27.0" />
-		<PackageVersion Include="Mockolate" Version="1.4.1" />
+		<PackageVersion Include="aweXpect.Core" Version="2.28.0" />
+		<PackageVersion Include="aweXpect.Chronology" Version="1.0.0" />
+		<PackageVersion Include="Mockolate" Version="1.5.4" />
 	</ItemGroup>
 	<ItemGroup>
 		<PackageVersion Include="Nullable" Version="1.3.1" />

Source/aweXpect.Mockolate/Options/WithinOptions.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Threading;
+
+namespace aweXpect.Options;
+
+/// <summary>
+///     The options for a verification result which allows specifying a timeout and/or cancellation token for the
+///     verification.
+/// </summary>
+public class WithinOptions
+{
+	/// <summary>
+	///     The timeout that is applied to the verification.
+	/// </summary>
+	public TimeSpan? Timeout { get; set; }
+
+	/// <summary>
+	///     The cancellation token that is used to cancel the verification.
+	/// </summary>
+	public CancellationToken? CancellationToken { get; set; }
+}

Source/aweXpect.Mockolate/Results/AndOrWithinResult.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Threading;
+using aweXpect.Core;
+using aweXpect.Options;
+
+namespace aweXpect.Results;
+
+/// <summary>
+///     The result of a verification result which allows specifying a timeout and/or cancellation token for the
+///     verification.
+/// </summary>
+/// <remarks>
+///     <seealso cref="AndOrResult{TCollection, TThat}" />
+/// </remarks>
+public class AndOrWithinResult<TType, TThat>(
+	ExpectationBuilder expectationBuilder,
+	TThat returnValue,
+	WithinOptions options)
+	: AndOrWithinResult<TType, TThat, AndOrWithinResult<TType, TThat>>(
+		expectationBuilder,
+		returnValue,
+		options);
+
+/// <inheritdoc cref="AndOrWithinResult{TType, TThat}" />
+public class AndOrWithinResult<TType, TThat, TSelf> : AndOrResult<TType, TThat>
+	where TSelf : AndOrWithinResult<TType, TThat, TSelf>
+{
+	private readonly WithinOptions _options;
+
+	/// <inheritdoc cref="AndOrWithinResult{TType, TThat, TSelf}" />
+	protected AndOrWithinResult(ExpectationBuilder expectationBuilder, TThat returnValue, WithinOptions options)
+		: base(expectationBuilder, returnValue)
+	{
+		_options = options;
+	}
+
+	/// <summary>
+	///     …within the given <paramref name="timeout" />.
+	/// </summary>
+	public TSelf Within(TimeSpan timeout)
+	{
+		_options.Timeout = timeout;
+		return (TSelf)this;
+	}
+
+	/// <summary>
+	///     …with the given <paramref name="cancellationToken" />.
+	/// </summary>
+	public new TSelf WithCancellation(CancellationToken cancellationToken)
+	{
+		_options.CancellationToken = cancellationToken;
+		base.WithCancellation(cancellationToken);
+		return (TSelf)this;
+	}
+}

Source/aweXpect.Mockolate/ThatVerificationResult.AtLeast.cs

@@ -1,5 +1,6 @@
 using aweXpect.Core;
 using aweXpect.Helpers;
+using aweXpect.Options;
 using aweXpect.Results;
 using Mockolate.Verify;
 
@@ -8,11 +9,16 @@ namespace aweXpect;
 public static partial class ThatVerificationResult
 {
 	/// <summary>
-	///     Verifies that the checked interaction happened at least the number of <paramref name="times"/>.
+	///     Verifies that the checked interaction happened at least the number of <paramref name="times" />.
 	/// </summary>
-	public static AndOrResult<VerificationResult<TVerify>, IThat<VerificationResult<TVerify>>> AtLeast<TVerify>(
-		this IThat<VerificationResult<TVerify>> subject, Times times)
-		=> new(subject.Get().ExpectationBuilder.AddConstraint((expectationBuilder, it, grammars)
-				=> new HasAtLeastConstraint<TVerify>(expectationBuilder, it, grammars, times.Value)),
-			subject);
+	public static AndOrWithinResult<VerificationResult<TVerify>, IThat<VerificationResult<TVerify>>>
+		AtLeast<TVerify>(this IThat<VerificationResult<TVerify>> subject, Times times)
+	{
+		WithinOptions options = new();
+		return new AndOrWithinResult<VerificationResult<TVerify>, IThat<VerificationResult<TVerify>>>(
+			subject.Get().ExpectationBuilder.AddConstraint((expectationBuilder, it, grammars)
+				=> new HasAtLeastConstraint<TVerify>(expectationBuilder, it, grammars, times.Value, options)),
+			subject,
+			options);
+	}
 }

Source/aweXpect.Mockolate/ThatVerificationResult.AtLeastOnce.cs

@@ -1,5 +1,6 @@
 using aweXpect.Core;
 using aweXpect.Helpers;
+using aweXpect.Options;
 using aweXpect.Results;
 using Mockolate.Verify;
 
@@ -10,9 +11,14 @@ public static partial class ThatVerificationResult
 	/// <summary>
 	///     Verifies that the checked interaction happened at least once.
 	/// </summary>
-	public static AndOrResult<VerificationResult<TVerify>, IThat<VerificationResult<TVerify>>> AtLeastOnce<TVerify>(
-		this IThat<VerificationResult<TVerify>> subject)
-		=> new(subject.Get().ExpectationBuilder.AddConstraint((expectationBuilder, it, grammars)
-				=> new HasAtLeastConstraint<TVerify>(expectationBuilder, it, grammars, 1)),
-			subject);
+	public static AndOrWithinResult<VerificationResult<TVerify>, IThat<VerificationResult<TVerify>>>
+		AtLeastOnce<TVerify>(this IThat<VerificationResult<TVerify>> subject)
+	{
+		WithinOptions options = new();
+		return new AndOrWithinResult<VerificationResult<TVerify>, IThat<VerificationResult<TVerify>>>(
+			subject.Get().ExpectationBuilder.AddConstraint((expectationBuilder, it, grammars)
+				=> new HasAtLeastConstraint<TVerify>(expectationBuilder, it, grammars, 1, options)),
+			subject,
+			options);
+	}
 }

Source/aweXpect.Mockolate/ThatVerificationResult.AtLeastTwice.cs

@@ -1,5 +1,6 @@
 using aweXpect.Core;
 using aweXpect.Helpers;
+using aweXpect.Options;
 using aweXpect.Results;
 using Mockolate.Verify;
 
@@ -10,9 +11,14 @@ public static partial class ThatVerificationResult
 	/// <summary>
 	///     Verifies that the checked interaction happened at least twice.
 	/// </summary>
-	public static AndOrResult<VerificationResult<TVerify>, IThat<VerificationResult<TVerify>>> AtLeastTwice<TVerify>(
-		this IThat<VerificationResult<TVerify>> subject)
-		=> new(subject.Get().ExpectationBuilder.AddConstraint((expectationBuilder, it, grammars)
-				=> new HasAtLeastConstraint<TVerify>(expectationBuilder, it, grammars, 2)),
-			subject);
+	public static AndOrWithinResult<VerificationResult<TVerify>, IThat<VerificationResult<TVerify>>>
+		AtLeastTwice<TVerify>(this IThat<VerificationResult<TVerify>> subject)
+	{
+		WithinOptions options = new();
+		return new AndOrWithinResult<VerificationResult<TVerify>, IThat<VerificationResult<TVerify>>>(
+			subject.Get().ExpectationBuilder.AddConstraint((expectationBuilder, it, grammars)
+				=> new HasAtLeastConstraint<TVerify>(expectationBuilder, it, grammars, 2, options)),
+			subject,
+			options);
+	}
 }

Source/aweXpect.Mockolate/ThatVerificationResult.AtMost.cs

@@ -8,10 +8,10 @@ namespace aweXpect;
 public static partial class ThatVerificationResult
 {
 	/// <summary>
-	///     Verifies that the checked interaction happened at most the number of <paramref name="times"/>.
+	///     Verifies that the checked interaction happened at most the number of <paramref name="times" />.
 	/// </summary>
-	public static AndOrResult<VerificationResult<TVerify>, IThat<VerificationResult<TVerify>>> AtMost<TVerify>(
-		this IThat<VerificationResult<TVerify>> subject, Times times)
+	public static AndOrResult<VerificationResult<TVerify>, IThat<VerificationResult<TVerify>>>
+		AtMost<TVerify>(this IThat<VerificationResult<TVerify>> subject, Times times)
 		=> new(subject.Get().ExpectationBuilder.AddConstraint((expectationBuilder, it, grammars)
 				=> new HasAtMostConstraint<TVerify>(expectationBuilder, it, grammars, times.Value)),
 			subject);

Source/aweXpect.Mockolate/ThatVerificationResult.AtMostOnce.cs

@@ -10,8 +10,8 @@ public static partial class ThatVerificationResult
 	/// <summary>
 	///     Verifies that the checked interaction happened at most once.
 	/// </summary>
-	public static AndOrResult<VerificationResult<TVerify>, IThat<VerificationResult<TVerify>>> AtMostOnce<TVerify>(
-		this IThat<VerificationResult<TVerify>> subject)
+	public static AndOrResult<VerificationResult<TVerify>, IThat<VerificationResult<TVerify>>>
+		AtMostOnce<TVerify>(this IThat<VerificationResult<TVerify>> subject)
 		=> new(subject.Get().ExpectationBuilder.AddConstraint((expectationBuilder, it, grammars)
 				=> new HasAtMostConstraint<TVerify>(expectationBuilder, it, grammars, 1)),
 			subject);

Source/aweXpect.Mockolate/ThatVerificationResult.AtMostTwice.cs

@@ -10,8 +10,8 @@ public static partial class ThatVerificationResult
 	/// <summary>
 	///     Verifies that the checked interaction happened at most twice.
 	/// </summary>
-	public static AndOrResult<VerificationResult<TVerify>, IThat<VerificationResult<TVerify>>> AtMostTwice<TVerify>(
-		this IThat<VerificationResult<TVerify>> subject)
+	public static AndOrResult<VerificationResult<TVerify>, IThat<VerificationResult<TVerify>>>
+		AtMostTwice<TVerify>(this IThat<VerificationResult<TVerify>> subject)
 		=> new(subject.Get().ExpectationBuilder.AddConstraint((expectationBuilder, it, grammars)
 				=> new HasAtMostConstraint<TVerify>(expectationBuilder, it, grammars, 2)),
 			subject);

Source/aweXpect.Mockolate/ThatVerificationResult.Between.cs

@@ -1,8 +1,11 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
 using aweXpect.Core;
 using aweXpect.Core.Constraints;
 using aweXpect.Helpers;
+using aweXpect.Options;
 using aweXpect.Results;
 using Mockolate.Verify;
 
@@ -13,28 +16,69 @@ public static partial class ThatVerificationResult
 	/// <summary>
 	///     Verifies that the checked interaction happened between <paramref name="minimum" />…
 	/// </summary>
-	public static BetweenResult<AndOrResult<VerificationResult<TVerify>, IThat<VerificationResult<TVerify>>>, Times>
-		Between<TVerify>(
-			this IThat<VerificationResult<TVerify>> subject, int minimum)
-		=> new(maximum => new AndOrResult<VerificationResult<TVerify>, IThat<VerificationResult<TVerify>>>(subject.Get()
-				.ExpectationBuilder.AddConstraint((expectationBuilder, it, grammars)
-					=> new HasBetweenConstraint<TVerify>(expectationBuilder, it, grammars, minimum, maximum.Value)),
-			subject));
-
+	public static BetweenResult<AndOrWithinResult<VerificationResult<TVerify>, IThat<VerificationResult<TVerify>>>,
+			Times>
+		Between<TVerify>(this IThat<VerificationResult<TVerify>> subject, int minimum)
+	{
+		WithinOptions options = new();
+		return new
+			BetweenResult<AndOrWithinResult<VerificationResult<TVerify>, IThat<VerificationResult<TVerify>>>,
+				Times>(maximum
+				=> new AndOrWithinResult<VerificationResult<TVerify>, IThat<VerificationResult<TVerify>>>(
+					subject.Get().ExpectationBuilder.AddConstraint((expectationBuilder, it, grammars)
+						=> new HasBetweenConstraint<TVerify>(expectationBuilder, it, grammars, minimum,
+							maximum.Value, options)),
+					subject,
+					options));
+	}
+
 	private sealed class HasBetweenConstraint<TVerify>(
 		ExpectationBuilder expectationBuilder,
 		string it,
 		ExpectationGrammars grammars,
 		int minimum,
-		int maximum)
+		int maximum,
+		WithinOptions options)
 		: ConstraintResult.WithValue<VerificationResult<TVerify>>(grammars),
-			IValueConstraint<VerificationResult<TVerify>>
+			IAsyncConstraint<VerificationResult<TVerify>>
 	{
 		private int _count = -1;
 		private string _expectation = "";
 
-		public ConstraintResult IsMetBy(VerificationResult<TVerify> actual)
+		public async Task<ConstraintResult> IsMetBy(VerificationResult<TVerify> actual,
+			CancellationToken cancellationToken)
 		{
+			if (options.CancellationToken is not null)
+			{
+				actual = actual.WithCancellation(cancellationToken);
+			}
+
+			if (options.Timeout is not null)
+			{
+				actual = actual.Within(options.Timeout.Value);
+			}
+			else if (expectationBuilder.Timeout is not null)
+			{
+				actual = actual.Within(expectationBuilder.Timeout.Value);
+			}
+
+			if (actual is IAsyncVerificationResult asyncVerificationResult)
+			{
+				_expectation = asyncVerificationResult.Expectation;
+				Actual = actual;
+				Outcome = await asyncVerificationResult.VerifyAsync(interactions =>
+				{
+					string context = Formatter.Format(interactions, FormattingOptions.MultipleLines);
+					expectationBuilder.UpdateContexts(contexts => contexts.Add(
+						new ResultContext.SyncCallback("Interactions", () => context)));
+					_count = interactions.Length;
+					return interactions.Length >= minimum && interactions.Length <= maximum;
+				})
+					? Outcome.Success
+					: Outcome.Failure;
+				return this;
+			}
+
 			IVerificationResult result = actual;
 			_expectation = result.Expectation;
 			Actual = actual;

Source/aweXpect.Mockolate/ThatVerificationResult.Exactly.cs

@@ -1,5 +1,6 @@
 using aweXpect.Core;
 using aweXpect.Helpers;
+using aweXpect.Options;
 using aweXpect.Results;
 using Mockolate.Verify;
 
@@ -8,11 +9,16 @@ namespace aweXpect;
 public static partial class ThatVerificationResult
 {
 	/// <summary>
-	///     Verifies that the checked interaction happened exactly the number of <paramref name="times"/>.
+	///     Verifies that the checked interaction happened exactly the number of <paramref name="times" />.
 	/// </summary>
-	public static AndOrResult<VerificationResult<TVerify>, IThat<VerificationResult<TVerify>>> Exactly<TVerify>(
-		this IThat<VerificationResult<TVerify>> subject, Times times)
-		=> new(subject.Get().ExpectationBuilder.AddConstraint((expectationBuilder, it, grammars)
-				=> new HasExactlyConstraint<TVerify>(expectationBuilder, it, grammars, times.Value)),
-			subject);
+	public static AndOrWithinResult<VerificationResult<TVerify>, IThat<VerificationResult<TVerify>>>
+		Exactly<TVerify>(this IThat<VerificationResult<TVerify>> subject, Times times)
+	{
+		WithinOptions options = new();
+		return new AndOrWithinResult<VerificationResult<TVerify>, IThat<VerificationResult<TVerify>>>(
+			subject.Get().ExpectationBuilder.AddConstraint((expectationBuilder, it, grammars)
+				=> new HasExactlyConstraint<TVerify>(expectationBuilder, it, grammars, times.Value, options)),
+			subject,
+			options);
+	}
 }

Source/aweXpect.Mockolate/ThatVerificationResult.Never.cs

@@ -1,5 +1,6 @@
 using aweXpect.Core;
 using aweXpect.Helpers;
+using aweXpect.Options;
 using aweXpect.Results;
 using Mockolate.Verify;
 
@@ -10,9 +11,13 @@ public static partial class ThatVerificationResult
 	/// <summary>
 	///     Verifies that the checked interaction happened never.
 	/// </summary>
-	public static AndOrResult<VerificationResult<TVerify>, IThat<VerificationResult<TVerify>>> Never<TVerify>(
-		this IThat<VerificationResult<TVerify>> subject)
-		=> new(subject.Get().ExpectationBuilder.AddConstraint((expectationBuilder, it, grammars)
-				=> new HasExactlyConstraint<TVerify>(expectationBuilder, it, grammars, 0)),
+	public static AndOrResult<VerificationResult<TVerify>, IThat<VerificationResult<TVerify>>>
+		Never<TVerify>(this IThat<VerificationResult<TVerify>> subject)
+	{
+		WithinOptions options = new();
+		return new AndOrResult<VerificationResult<TVerify>, IThat<VerificationResult<TVerify>>>(
+			subject.Get().ExpectationBuilder.AddConstraint((expectationBuilder, it, grammars)
+				=> new HasExactlyConstraint<TVerify>(expectationBuilder, it, grammars, 0, options)),
 			subject);
+	}
 }

Source/aweXpect.Mockolate/ThatVerificationResult.Once.cs

@@ -1,5 +1,6 @@
 using aweXpect.Core;
 using aweXpect.Helpers;
+using aweXpect.Options;
 using aweXpect.Results;
 using Mockolate.Verify;
 
@@ -10,9 +11,14 @@ public static partial class ThatVerificationResult
 	/// <summary>
 	///     Verifies that the checked interaction happened exactly once.
 	/// </summary>
-	public static AndOrResult<VerificationResult<TVerify>, IThat<VerificationResult<TVerify>>> Once<TVerify>(
-		this IThat<VerificationResult<TVerify>> subject)
-		=> new(subject.Get().ExpectationBuilder.AddConstraint((expectationBuilder, it, grammars)
-				=> new HasExactlyConstraint<TVerify>(expectationBuilder, it, grammars, 1)),
-			subject);
+	public static AndOrWithinResult<VerificationResult<TVerify>, IThat<VerificationResult<TVerify>>>
+		Once<TVerify>(this IThat<VerificationResult<TVerify>> subject)
+	{
+		WithinOptions options = new();
+		return new AndOrWithinResult<VerificationResult<TVerify>, IThat<VerificationResult<TVerify>>>(
+			subject.Get().ExpectationBuilder.AddConstraint((expectationBuilder, it, grammars)
+				=> new HasExactlyConstraint<TVerify>(expectationBuilder, it, grammars, 1, options)),
+			subject,
+			options);
+	}
 }