From 8edd78f7ea0824310cf75e3c27523e3836ae8164 Mon Sep 17 00:00:00 2001
From: Qwertyluk <64921645+Qwertyluk@users.noreply.github.com>
Date: Tue, 28 May 2024 10:26:07 +0200
Subject: [PATCH] fix: Add ComponentParameterCollectionBuilder overloaded
 methods (#1467)

* ComponentParameterCollectionBuilder: Add overloaded methods

* CHANGELOG.md: Updated

---------

Co-authored-by: Pawel Krzyzak <Pawel.Krzyzak@krolldiscovery.com>
---
 CHANGELOG.md                                  |  4 ++
 .../ComponentParameterCollectionBuilder.cs    | 42 +++++++++++++++++++
 ...omponentParameterCollectionBuilderTests.cs | 31 +++++++++++++-
 3 files changed, 75 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 298508092..b3925f0d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,10 @@ All notable changes to **bUnit** will be documented in this file. The project ad
 
 - CI build changes to force running verification on x64 based AMD CPUs.
 
+### Added
+
+- New overloads for `ComponentParameterCollectionBuilder.Add` that allow passing arguments for asynchronous callback parameters. Reported by [springy76](https://github.com/springy76). By [@Qwertyluk](https://github.com/Qwertyluk).
+
 ## [1.28.9] - 2024-04-19
 
 ### Fixed
diff --git a/src/bunit/ComponentParameterCollectionBuilder.cs b/src/bunit/ComponentParameterCollectionBuilder.cs
index f1bbf142a..7c7ee8cc2 100644
--- a/src/bunit/ComponentParameterCollectionBuilder.cs
+++ b/src/bunit/ComponentParameterCollectionBuilder.cs
@@ -167,6 +167,26 @@ public ComponentParameterCollectionBuilder<TComponent> Add(Expression<Func<TComp
 	public ComponentParameterCollectionBuilder<TComponent> Add(Expression<Func<TComponent, EventCallback?>> parameterSelector, Func<Task> callback)
 		=> Add(parameterSelector, EventCallback.Factory.Create(callback?.Target!, callback!));
 
+	/// <summary>
+	/// Adds a component parameter for an <see cref="EventCallback"/> parameter selected with <paramref name="parameterSelector"/>,
+	/// where the <paramref name="callback"/> is used as value.
+	/// </summary>
+	/// <param name="parameterSelector">A lambda function that selects the parameter.</param>
+	/// <param name="callback">The callback to pass to the <see cref="EventCallback"/>.</param>
+	/// <returns>This <see cref="ComponentParameterCollectionBuilder{TComponent}"/>.</returns>
+	public ComponentParameterCollectionBuilder<TComponent> Add(Expression<Func<TComponent, EventCallback>> parameterSelector, Func<object, Task> callback)
+		=> Add(parameterSelector, EventCallback.Factory.Create(callback?.Target!, callback!));
+
+	/// <summary>
+	/// Adds a component parameter for a nullable <see cref="EventCallback"/> parameter selected with <paramref name="parameterSelector"/>,
+	/// where the <paramref name="callback"/> is used as value.
+	/// </summary>
+	/// <param name="parameterSelector">A lambda function that selects the parameter.</param>
+	/// <param name="callback">The callback to pass to the <see cref="EventCallback"/>.</param>
+	/// <returns>This <see cref="ComponentParameterCollectionBuilder{TComponent}"/>.</returns>
+	public ComponentParameterCollectionBuilder<TComponent> Add(Expression<Func<TComponent, EventCallback?>> parameterSelector, Func<object, Task> callback)
+		=> Add(parameterSelector, EventCallback.Factory.Create(callback?.Target!, callback!));
+
 	/// <summary>
 	/// Adds a component parameter for an <see cref="EventCallback{TValue}"/> parameter selected with <paramref name="parameterSelector"/>,
 	/// where the <paramref name="callback"/> is used as value.
@@ -233,6 +253,28 @@ public ComponentParameterCollectionBuilder<TComponent> Add<TValue>(Expression<Fu
 	public ComponentParameterCollectionBuilder<TComponent> Add<TValue>(Expression<Func<TComponent, EventCallback<TValue>?>> parameterSelector, Func<Task> callback)
 		=> Add(parameterSelector, EventCallback.Factory.Create<TValue>(callback?.Target!, callback!));
 
+	/// <summary>
+	/// Adds a component parameter for an <see cref="EventCallback{TValue}"/> parameter selected with <paramref name="parameterSelector"/>,
+	/// where the <paramref name="callback"/> is used as value.
+	/// </summary>
+	/// <param name="parameterSelector">A lambda function that selects the parameter.</param>
+	/// <param name="callback">The callback to pass to the <see cref="EventCallback"/>.</param>
+	/// <typeparam name="TValue">The value returned in the <see cref="EventCallback{TValue}"/>.</typeparam>
+	/// <returns>This <see cref="ComponentParameterCollectionBuilder{TComponent}"/>.</returns>
+	public ComponentParameterCollectionBuilder<TComponent> Add<TValue>(Expression<Func<TComponent, EventCallback<TValue>>> parameterSelector, Func<TValue, Task> callback)
+		=> Add(parameterSelector, EventCallback.Factory.Create<TValue>(callback?.Target!, callback!));
+
+	/// <summary>
+	/// Adds a component parameter for a nullable <see cref="EventCallback{TValue}"/> parameter selected with <paramref name="parameterSelector"/>,
+	/// where the <paramref name="callback"/> is used as value.
+	/// </summary>
+	/// <param name="parameterSelector">A lambda function that selects the parameter.</param>
+	/// <param name="callback">The callback to pass to the <see cref="EventCallback"/>.</param>
+	/// <typeparam name="TValue">The value returned in the <see cref="EventCallback{TValue}"/>.</typeparam>
+	/// <returns>This <see cref="ComponentParameterCollectionBuilder{TComponent}"/>.</returns>
+	public ComponentParameterCollectionBuilder<TComponent> Add<TValue>(Expression<Func<TComponent, EventCallback<TValue>?>> parameterSelector, Func<TValue, Task> callback)
+		=> Add(parameterSelector, EventCallback.Factory.Create<TValue>(callback?.Target!, callback!));
+
 	/// <summary>
 	/// Adds a ChildContent <see cref="RenderFragment"/> type parameter with the <paramref name="childContent"/> as value.
 	///
diff --git a/tests/bunit.tests/ComponentParameterCollectionBuilderTests.cs b/tests/bunit.tests/ComponentParameterCollectionBuilderTests.cs
index 2a8332954..960d7f738 100644
--- a/tests/bunit.tests/ComponentParameterCollectionBuilderTests.cs
+++ b/tests/bunit.tests/ComponentParameterCollectionBuilderTests.cs
@@ -1,5 +1,4 @@
 using System.Linq.Expressions;
-using Bunit.Rendering;
 
 namespace Bunit;
 
@@ -115,7 +114,7 @@ public void Test010()
 	[Fact(DisplayName = "Null to EventCallback throws")]
 	public void Test011()
 	{
-		Should.Throw<ArgumentNullException>(() => Builder.Add(x => x.EC, null!));
+		Should.Throw<ArgumentNullException>(() => Builder.Add(x => x.EC, (Func<Task>)null!));
 	}
 
 	[Fact(DisplayName = "Null for EventCallback? with parameter selector")]
@@ -225,6 +224,34 @@ public async Task Test025()
 		await VerifyEventCallbackAsync<EventArgs>("NullableECWithArgs");
 	}
 
+	[Fact(DisplayName = "Func<object, Task> to EventCallback with parameter selector")]
+	public async Task Test026()
+	{
+		Builder.Add(x => x.EC, _ => { EventCallbackCalled = true; return Task.CompletedTask; });
+		await VerifyEventCallbackAsync("EC");
+	}
+
+	[Fact(DisplayName = "Func<object, Task> to EventCallback? with parameter selector")]
+	public async Task Test027()
+	{
+		Builder.Add(x => x.NullableEC, _ => { EventCallbackCalled = true; return Task.CompletedTask; });
+		await VerifyEventCallbackAsync("NullableEC");
+	}
+
+	[Fact(DisplayName = "Func<T, Task> to EventCallback<T> with parameter selector")]
+	public async Task Test028()
+	{
+		Builder.Add(x => x.ECWithArgs, _ => { EventCallbackCalled = true; return Task.CompletedTask; });
+		await VerifyEventCallbackAsync<EventArgs>("ECWithArgs");
+	}
+
+	[Fact(DisplayName = "Func<T, Task> to EventCallback<T>? with parameter selector")]
+	public async Task Test029()
+	{
+		Builder.Add(x => x.NullableECWithArgs, _ => { EventCallbackCalled = true; return Task.CompletedTask; });
+		await VerifyEventCallbackAsync<EventArgs>("NullableECWithArgs");
+	}
+
 	[Fact(DisplayName = "ChildContent can be passed as RenderFragment")]
 	public void Test030()
 	{