Merge pull request #73 from zadykian/fix/attribute-filters

Attaching filter via attribute leads to InvalidOperationException

Author: neuecc

src/ConsoleAppFramework/ConsoleAppFilter.cs

@@ -75,12 +75,9 @@ public WithFilterInvoker(MethodInfo methodInfo, object? instance, object?[] invo
             var methodFilters = methodInfo.GetCustomAttributes<ConsoleAppFilterAttribute>(true);
             foreach (var item in classFilters.Concat(methodFilters))
             {
-                var filter = ActivatorUtilities.CreateInstance<ConsoleAppFilter>(serviceProvider, item.Type);
-                if (filter != null)
-                {
-                    filter.Order = item.Order;
-                    list.Add(filter);
-                }
+                var filter = (ConsoleAppFilter) ActivatorUtilities.CreateInstance(serviceProvider, item.Type);
+                filter.Order = item.Order;
+                list.Add(filter);
             }
 
             var sortedAndReversedFilters = list.OrderBy(x => x.Order).Reverse().ToArray();

tests/ConsoleAppFramework.Tests/Integration/CommandFilterTest.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Threading.Tasks;
+using FluentAssertions;
+using Microsoft.Extensions.Hosting;
+using Xunit;
+// ReSharper disable UnusedMember.Local
+// ReSharper disable ClassNeverInstantiated.Local
+
+namespace ConsoleAppFramework.Integration.Test;
+
+public class FilterTest
+{
+	[Fact]
+	public void ApplyAttributeFilterTest()
+	{
+		using var console = new CaptureConsoleOutput();
+		var args = new[] { "test-argument-name" };
+		Host.CreateDefaultBuilder().RunConsoleAppFrameworkAsync<TestConsoleApp>(args);
+		console.Output.Should().Contain("[in filter] before");
+		console.Output.Should().Contain(args[0]);
+		console.Output.Should().Contain("[in filter] after");
+	}
+
+	/// <inheritdoc />
+	private class TestConsoleApp : ConsoleAppBase
+	{
+		[RootCommand]
+		[ConsoleAppFilter(typeof(TestFilter))]
+		public void RootCommand([Option(index: 0)]string someArgument) => Console.WriteLine(someArgument);
+	}
+
+	/// <inheritdoc />
+	private class TestFilter : ConsoleAppFilter
+	{
+		/// <inheritdoc />
+		public override async ValueTask Invoke(ConsoleAppContext context, Func<ConsoleAppContext, ValueTask> next)
+		{
+			Console.WriteLine("[in filter] before");
+			await next(context);
+			Console.WriteLine("[in filter] after");
+		}
+	}
+}