(maint) added some unittests

Author: nils-a

src/Spectre.Console.Registrars.SimpleInjector.Tests/RegistrarTests.cs

@@ -1,11 +1,24 @@
-using Shouldly;
+using System;
+
+using Shouldly;
 
 using Xunit;
 
 namespace Spectre.Console.Registrars.SimpleInjector.Tests
 {
     public class RegistrarTests
     {
+        [Fact]
+        public void Resolver_Resolving_null_Throws()
+        {
+            var fixture = new RegistrarFixture();
+            var resolver = fixture.GetResolver();
+
+            Action action = () => resolver.Resolve(null);
+
+            action.ShouldThrow<ArgumentNullException>();
+        }
+
         [Fact]
         public void Resolver_Should_Return_Registration_From_Container()
         {
@@ -56,6 +69,20 @@ public void Resolver_Should_Return_Lazy_From_Registrar()
             ReferenceEquals(expected, actual).ShouldBeTrue();
         }
 
+        [Fact]
+        public void Resolver_Resolving_From_Multiple_Lazies_Returns_The_Last_Registration()
+        {
+            var fixture = new RegistrarFixture();
+            fixture.GivenMultiRegistrationTypes(typeof(ISomeInterface));
+            fixture.GivenOnRegistrar(r => r.RegisterLazy(typeof(ISomeInterface), () => new SomeDependency()));
+            fixture.GivenOnRegistrar(r => r.RegisterLazy(typeof(ISomeInterface), () => new SomeOtherDependency()));
+
+            var actual = fixture.GetResolver().Resolve(typeof(ISomeInterface));
+
+            actual.ShouldNotBeNull();
+            actual.ShouldBeOfType<SomeOtherDependency>();
+        }
+
         [Fact(Skip = "Doesn't work at the moment")]
         public void Resolver_Should_Not_Call_Lazy_Factory_If_Not_Needed()
         {
@@ -99,6 +126,20 @@ public void Resolver_Resolving_From_Multiple_Returns_The_Last_Registration()
             actual.ShouldBeOfType<SomeOtherDependency>();
         }
 
+        [Fact]
+        public void Resolver_Resolving_From_Multiple_Instances_Returns_The_Last_Registration()
+        {
+            var fixture = new RegistrarFixture();
+            fixture.GivenMultiRegistrationTypes(typeof(ISomeInterface));
+            fixture.GivenOnRegistrar(r => r.RegisterInstance(typeof(ISomeInterface), new SomeDependency()));
+            fixture.GivenOnRegistrar(r => r.RegisterInstance(typeof(ISomeInterface), new SomeOtherDependency()));
+
+            var actual = fixture.GetResolver().Resolve(typeof(ISomeInterface));
+
+            actual.ShouldNotBeNull();
+            actual.ShouldBeOfType<SomeOtherDependency>();
+        }
+
         private interface ISomeInterface
         {
         }

src/Spectre.Console.Registrars.SimpleInjector/SimlpeInjectorRegistrar.cs

@@ -3,7 +3,8 @@
 using SimpleInjector;
 using Spectre.Console.Cli;
 
-namespace Spectre.Console.Registrars.SimpleInjector
+// ReSharper disable once CheckNamespace
+namespace Spectre.Console
 {
     /// <summary>
     /// Implements <see cref="ITypeRegistrar"/> using a SimpleInjector <see cref="Container"/>.
@@ -72,8 +73,8 @@ public void RegisterLazy(Type service, Func<object> factory)
             // todo: non of these code-paths are lazy!!
             if (multiRegistrationTypes.Contains(service))
             {
-                // todo: this ignores the lifestyle, but seemingly Func<object> can not be used on collections.
-                container.Collection.AppendInstance(service, factory());
+                var registration = lifestyle.CreateRegistration(service, factory, container);
+                container.Collection.Append(service, registration);
                 return;
             }
 
@@ -105,12 +106,11 @@ public object Resolve(Type type)
                     throw new ArgumentNullException(nameof(type));
                 }
 
-                if (multiRegistrationTypes.Contains(type))
-                {
-                    return container.GetAllInstances(type).LastOrDefault();
-                }
+                var implementation = multiRegistrationTypes.Contains(type)
+                    ? container.GetAllInstances(type).LastOrDefault()
+                    : container.GetInstance(type);
 
-                return container.GetInstance(type);
+                return implementation;
             }
         }
     }