Adjust unit tests for AOT compatibility.

Author: prochnowc

DependencyInjection/test/AppCoreNet.Extensions.DependencyInjection.AssemblyExtensions.Tests/AssemblyResolverTests.cs

@@ -46,15 +46,16 @@ public void ResolvesAllFacilityExtensions()
                                     .Add(typeof(AssemblyResolverTests).Assembly)
                                     .ClearDefaultFilters();
 
-        IEnumerable<IFacilityExtension<IFacility>> facilityExtensions =
-            ((IFacilityExtensionResolver)resolver).Resolve(typeof(Facility1));
+        IFacilityExtension[] facilityExtensions =
+            ((IFacilityExtensionResolver)resolver).Resolve(typeof(Facility1))
+                                                  .ToArray();
 
-        facilityExtensions.Should()
-                          .AllBeOfType<FacilityExtensionWrapper<Facility1>>();
+        facilityExtensions[0]
+            .Should()
+            .BeOfType<Facility1Extension1>();
 
-        facilityExtensions.OfType<FacilityExtensionWrapper<Facility1>>()
-                          .Select(e => e.Extension.GetType())
-                          .Should()
-                          .BeEquivalentTo(new[] { typeof(Facility1Extension1), typeof(Facility1Extension2) });
+        facilityExtensions[1]
+            .Should()
+            .BeOfType<Facility1Extension2>();
     }
 }

DependencyInjection/test/AppCoreNet.Extensions.DependencyInjection.AssemblyExtensions.Tests/Facility1.cs

@@ -1,12 +1,11 @@
 // Licensed under the MIT license.
 // Copyright (c) The AppCore .NET project.
 
-using AppCoreNet.Extensions.DependencyInjection.Facilities;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace AppCoreNet.Extensions.DependencyInjection;
 
-public class Facility1 : IFacility
+public class Facility1 : IFacility1
 {
     public void ConfigureServices(IServiceCollection services)
     {

DependencyInjection/test/AppCoreNet.Extensions.DependencyInjection.AssemblyExtensions.Tests/Facility1Extension2.cs

@@ -6,7 +6,7 @@
 
 namespace AppCoreNet.Extensions.DependencyInjection;
 
-public class Facility1Extension2 : IFacilityExtension<Facility1>
+public class Facility1Extension2 : IFacilityExtension<IFacility1>
 {
     public void ConfigureServices(IServiceCollection services)
     {

DependencyInjection/test/AppCoreNet.Extensions.DependencyInjection.AssemblyExtensions.Tests/Facility2.cs

@@ -1,12 +1,11 @@
 // Licensed under the MIT license.
 // Copyright (c) The AppCore .NET project.
 
-using AppCoreNet.Extensions.DependencyInjection.Facilities;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace AppCoreNet.Extensions.DependencyInjection;
 
-public class Facility2 : IFacility
+public class Facility2 : IFacility2
 {
     public void ConfigureServices(IServiceCollection services)
     {

DependencyInjection/test/AppCoreNet.Extensions.DependencyInjection.AssemblyExtensions.Tests/Facility2Extension1.cs

@@ -0,0 +1,14 @@
+// Licensed under the MIT license.
+// Copyright (c) The AppCore .NET project.
+
+using AppCoreNet.Extensions.DependencyInjection.Facilities;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace AppCoreNet.Extensions.DependencyInjection;
+
+public class Facility2Extension1 : IFacilityExtension<Facility2>
+{
+    public void ConfigureServices(IServiceCollection services)
+    {
+    }
+}

DependencyInjection/test/AppCoreNet.Extensions.DependencyInjection.AssemblyExtensions.Tests/Facility2Extension2.cs

@@ -0,0 +1,14 @@
+// Licensed under the MIT license.
+// Copyright (c) The AppCore .NET project.
+
+using AppCoreNet.Extensions.DependencyInjection.Facilities;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace AppCoreNet.Extensions.DependencyInjection;
+
+public class Facility2Extension2 : IFacilityExtension<IFacility2>
+{
+    public void ConfigureServices(IServiceCollection services)
+    {
+    }
+}

DependencyInjection/test/AppCoreNet.Extensions.DependencyInjection.AssemblyExtensions.Tests/IFacility1.cs

@@ -0,0 +1,10 @@
+// Licensed under the MIT license.
+// Copyright (c) The AppCore .NET project.
+
+using AppCoreNet.Extensions.DependencyInjection.Facilities;
+
+namespace AppCoreNet.Extensions.DependencyInjection;
+
+public interface IFacility1 : IFacility
+{
+}

DependencyInjection/test/AppCoreNet.Extensions.DependencyInjection.AssemblyExtensions.Tests/IFacility2.cs

@@ -0,0 +1,10 @@
+// Licensed under the MIT license.
+// Copyright (c) The AppCore .NET project.
+
+using AppCoreNet.Extensions.DependencyInjection.Facilities;
+
+namespace AppCoreNet.Extensions.DependencyInjection;
+
+public interface IFacility2 : IFacility
+{
+}

DependencyInjection/test/AppCoreNet.Extensions.DependencyInjection.Tests/Facilities/FacilityBuilderTests.cs

@@ -74,7 +74,7 @@ public void AddExtensionsFromInvokesResolver()
     {
         var resolver = Substitute.For<IFacilityExtensionResolver>();
         resolver.Resolve(Arg.Any<Type>())
-                .Returns(Array.Empty<IFacilityExtension<IFacility>>());
+                .Returns(Array.Empty<IFacilityExtension>());
 
         var builder = new FacilityBuilder<TestFacility>(_services, _activator);
         builder.AddExtensionsFrom(r => r.AddResolver(resolver));