Add option to exclude types with AutoMocker

README.md

@@ -86,4 +86,23 @@ public class AutoMockerTestContextTests : AutoMockerTestContext
 }
 ```
 
+When a certain type should not be handled by AutoMocker, a list of types can be provided via the constructor to exclude:
+``` cs
+public class ExcludeTypesTests : AutoMockerTestContext
+{
+    public ExcludeTypesTests() : base(typeof(IMyOtherDependency))
+    { }
+
+    [Fact]
+    public void WhenUnregisteredDependencyIsNotHandledByAutoMocker_ThrowsInvalidOperationException()
+    {
+        // Arrange
+        Mocker.Use<IMydependency>(x => x.GetSomeValue() == "Hello World");
+
+        // Act & Assert
+        Assert.Throws<InvalidOperationException>(() => RenderComponent<Routes>());
+    }
+}
+```
+
 [0]:https://github.com/moq/Moq.AutoMocker

bunit.AutoMocker.Tests/AutoMockerTestBase.cs

@@ -0,0 +1,8 @@
+using Bunit.AutoMocker;
+using Microsoft.AspNetCore.Components;
+
+namespace bunit.AutoMocker.Tests;
+
+public abstract class AutoMockerTestBase(params Type[] typesToExclude)
+    : AutoMockerTestContext(typesToExclude.Union(new[] { typeof(IComponentActivator) }).ToArray())
+{ }

bunit.AutoMocker.Tests/AutoMockerTestContextTests.cs

@@ -1,11 +1,8 @@
 using bunit.BlazorTestApp.Components;
-using Bunit;
-using Bunit.AutoMocker;
-using Microsoft.Extensions.DependencyInjection;
 
 namespace bunit.AutoMocker.Tests;
 
-public class AutoMockerTestContextTests : AutoMockerTestContext
+public class AutoMockerTestContextTests : AutoMockerTestBase
 {
     [Fact]
     public void CreatesUnregisteredDependencies()
@@ -20,44 +17,3 @@ public void CreatesUnregisteredDependencies()
         Assert.Contains(cut.Markup, "Hello World");
     }
 }
-
-public class WithoutAutoMockerTests : TestContext
-{
-    [Fact]
-    public void Fails_WhenDependenciesAreUnregistered()
-    {
-        Assert.Throws<InvalidOperationException>(() => RenderComponent<Routes>());
-    }
-
-    [Fact]
-    public void Fails_WhenAllOnlyUsedDependencyIsRegisterd()
-    {
-        // Arrange
-        var myDependency = new Moq.Mock<IMydependency>();
-        myDependency.Setup(x => x.GetSomeValue()).Returns("Hello World");
-
-        Services.AddSingleton<IMydependency>(myDependency.Object);
-
-        // Act & Assert
-        Assert.Throws<InvalidOperationException>(() => RenderComponent<Routes>());
-    }
-
-    [Fact]
-    public void Succeeds_WhenAllDependenciesAreRegistered()
-    {
-        // Arrange
-        var myDependency = new Moq.Mock<IMydependency>();
-        myDependency.Setup(x => x.GetSomeValue()).Returns("Hello World");
-
-        Services.AddSingleton<IMydependency>(myDependency.Object);
-
-        var myOtherDependency = new Moq.Mock<IMyOtherDependency>();
-        Services.AddSingleton<IMyOtherDependency>(myOtherDependency.Object);
-
-        // Act
-        var cut = RenderComponent<Routes>();
-
-        // Assert
-        Assert.Contains(cut.Markup, "Hello World");
-    }
-}

bunit.AutoMocker.Tests/ExcludeTypesTests.cs

@@ -0,0 +1,19 @@
+using bunit.BlazorTestApp.Components;
+
+namespace bunit.AutoMocker.Tests;
+
+public sealed class ExcludeTypesTests : AutoMockerTestBase
+{
+    public ExcludeTypesTests() : base(typeof(IMyOtherDependency))
+    { }
+
+    [Fact]
+    public void WhenUnregisteredDependencyIsNotHandledByAutoMocker_ThrowsInvalidOperationException()
+    {
+        // Arrange
+        Mocker.Use<IMydependency>(x => x.GetSomeValue() == "Hello World");
+
+        // Act & Assert
+        Assert.Throws<InvalidOperationException>(() => RenderComponent<Routes>());
+    }
+}

bunit.AutoMocker.Tests/WithoutAutoMockerTests.cs

@@ -0,0 +1,46 @@
+using bunit.BlazorTestApp.Components;
+using Bunit;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace bunit.AutoMocker.Tests;
+
+public class WithoutAutoMockerTests : TestContext
+{
+    [Fact]
+    public void Fails_WhenDependenciesAreUnregistered()
+    {
+        Assert.Throws<InvalidOperationException>(() => RenderComponent<Routes>());
+    }
+
+    [Fact]
+    public void Fails_WhenAllOnlyUsedDependencyIsRegisterd()
+    {
+        // Arrange
+        var myDependency = new Moq.Mock<IMydependency>();
+        myDependency.Setup(x => x.GetSomeValue()).Returns("Hello World");
+
+        Services.AddSingleton<IMydependency>(myDependency.Object);
+
+        // Act & Assert
+        Assert.Throws<InvalidOperationException>(() => RenderComponent<Routes>());
+    }
+
+    [Fact]
+    public void Succeeds_WhenAllDependenciesAreRegistered()
+    {
+        // Arrange
+        var myDependency = new Moq.Mock<IMydependency>();
+        myDependency.Setup(x => x.GetSomeValue()).Returns("Hello World");
+
+        Services.AddSingleton<IMydependency>(myDependency.Object);
+
+        var myOtherDependency = new Moq.Mock<IMyOtherDependency>();
+        Services.AddSingleton<IMyOtherDependency>(myOtherDependency.Object);
+
+        // Act
+        var cut = RenderComponent<Routes>();
+
+        // Assert
+        Assert.Contains(cut.Markup, "Hello World");
+    }
+}

bunit.AutoMocker.Tests/bunit.AutoMocker.Tests.csproj

@@ -10,10 +10,16 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.5.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
+    <PackageReference Include="coverlet.collector" Version="6.0.4">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.4">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

bunit.AutoMocker/AutoMockerServiceProvider.cs

@@ -1,13 +1,18 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace Bunit.AutoMocker;
 
-public class AutoMockerServiceProvider(Moq.AutoMock.AutoMocker mocker) : IServiceProvider
+public class AutoMockerServiceProvider(Moq.AutoMock.AutoMocker mocker, params Type[] typesToExclude) : IServiceProvider
 {
-    private readonly Moq.AutoMock.AutoMocker Mocker = mocker;
+    private readonly HashSet<Type> _typesToExclude = typesToExclude.ToHashSet();
+    private readonly Moq.AutoMock.AutoMocker _mocker = mocker;
 
-    public object GetService(Type serviceType)
+    public object? GetService(Type serviceType)
     {
-        return Mocker.Get(serviceType);
+        return _typesToExclude.Contains(serviceType) 
+            ? null 
+            : _mocker.Get(serviceType);
     }
 }

bunit.AutoMocker/AutoMockerTestContext.cs

@@ -1,14 +1,16 @@
-namespace Bunit.AutoMocker;
+using System;
+
+namespace Bunit.AutoMocker;
 
 public abstract class AutoMockerTestContext : TestContext
 {
     protected readonly Moq.AutoMock.AutoMocker Mocker = new();
 
-    public AutoMockerTestContext() : this(new Moq.AutoMock.AutoMocker()) { }
+    public AutoMockerTestContext(params Type[] typesToExclude) : this(new Moq.AutoMock.AutoMocker(), typesToExclude) { }
 
-    public AutoMockerTestContext(Moq.AutoMock.AutoMocker mocker)
+    public AutoMockerTestContext(Moq.AutoMock.AutoMocker mocker, params Type[] typesToExclude)
     {
         Mocker = mocker;
-        Services.AddFallbackServiceProvider(new AutoMockerServiceProvider(Mocker));
+        Services.AddFallbackServiceProvider(new AutoMockerServiceProvider(Mocker, typesToExclude));
     }
 }

bunit.AutoMocker/bunit.AutoMocker.csproj

@@ -4,10 +4,11 @@
     <TargetFramework>netstandard2.1</TargetFramework>
     <langversion>latest</langversion>
     <PackageId>Snerte.bunit.AutoMocker</PackageId>
-    <Version>0.0.2</Version>
+    <Version>0.0.3</Version>
     <Authors>Maarten Göertz</Authors>
     <PackageDescription>This pacakge combines AutoMocker with bunit</PackageDescription>
     <RepositoryUrl>https://github.com/snerte/bunit.AutoMocker</RepositoryUrl>
+	<Nullable>enable</Nullable>
   </PropertyGroup>
 
 
@@ -16,7 +17,7 @@
 </PropertyGroup>
 
 <ItemGroup>
-  <PackageReference Include="bunit" Version="1.26.64" />
+  <PackageReference Include="bunit" Version="1.40.0" />
   <PackageReference Include="Moq.AutoMock" Version="3.5.0" />
 </ItemGroup>
 
@@ -25,7 +26,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="../README.md" Pack="true" PackagePath=""/>
+    <None Include="../README.md" Pack="true" PackagePath="" />
   </ItemGroup>
 
 </Project>