Merge pull request #7 from nils-a/feature/GH-5

(#5) used TypeRegistrarBaseTests

Author: nils-a

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

@@ -1,6 +1,8 @@
-using System;
+using Shouldly;
 
-using Shouldly;
+using SimpleInjector;
+
+using Spectre.Console.Testing;
 
 using Xunit;
 
@@ -9,14 +11,15 @@ namespace Spectre.Console.Registrars.SimpleInjector.Tests
     public class RegistrarTests
     {
         [Fact]
-        public void Resolver_Resolving_null_Throws()
+        public void Should_Pass_Base_Tests()
         {
-            var fixture = new RegistrarFixture();
-            var resolver = fixture.GetResolver();
-
-            Action action = () => resolver.Resolve(null);
+            var baseTests = new TypeRegistrarBaseTests(() =>
+            {
+                var container = new Container();
+                return new SimpleInjectorRegistrar(container);
+            });
 
-            action.ShouldThrow<ArgumentNullException>();
+            baseTests.RunAllTests();
         }
 
         [Fact]

src/Spectre.Console.Registrars.SimpleInjector.Tests/Spectre.Console.Registrars.SimpleInjector.Tests.csproj

@@ -14,7 +14,8 @@
         <PackageReference Include="Moq" Version="4.16.1" />
         <PackageReference Include="Shouldly" Version="4.0.3" />
         <PackageReference Include="SimpleInjector" Version="5.3.2" />
-        <PackageReference Include="Spectre.Console" Version="0.41.0" />
+        <PackageReference Include="Spectre.Console" Version="0.43.0" />
+        <PackageReference Include="Spectre.Console.Testing" Version="0.43.0" />
         <PackageReference Include="xunit" Version="2.4.1" />
         <PackageReference Include="xunit.analyzers" Version="0.10.0" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">

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

@@ -64,10 +64,18 @@ public object Resolve(Type type)
             {
                 if (type == null)
                 {
-                    throw new ArgumentNullException(nameof(type));
+                    return null;
                 }
 
-                var implementation = container.GetInstance(type);
+                object implementation = null;
+                try
+                {
+                    implementation = container.GetInstance(type);
+                }
+                catch (ActivationException)
+                {
+                    // ignored
+                }
 
                 return implementation;
             }

src/Spectre.Console.Registrars.SimpleInjector/Spectre.Console.Registrars.SimpleInjector.csproj

@@ -34,7 +34,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="SimpleInjector" Version="5.0.0" PrivateAssets="all" />
-    <PackageReference Include="Spectre.Console" Version="0.38.0" PrivateAssets="all" />
+    <PackageReference Include="Spectre.Console" Version="0.43.0" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>