test(deps): replace Moq with NSubstitute

skwasjer · Aug 26, 2023 · d5f66a5 · d5f66a5
1 parent f162700
commit d5f66a5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/test/Correlate.Core.Tests/CorrelationManagerTests.cs b/test/Correlate.Core.Tests/CorrelationManagerTests.cs
@@ -13,7 +13,7 @@ public class CorrelationManagerTests : IDisposable
 {
     private const string GeneratedCorrelationId = "generated-correlation-id";
     private readonly CorrelationContextAccessor _correlationContextAccessor;
-    private readonly Mock<ICorrelationIdFactory> _correlationIdFactoryMock;
+    private readonly ICorrelationIdFactory _correlationIdFactoryMock;
     private readonly ILogger<CorrelationManager> _logger;
     private readonly SerilogLoggerProvider _logProvider;
     private readonly CorrelationManager _sut;
@@ -22,11 +22,10 @@ protected CorrelationManagerTests()
     {
         _correlationContextAccessor = new CorrelationContextAccessor();
 
-        _correlationIdFactoryMock = new Mock<ICorrelationIdFactory>();
+        _correlationIdFactoryMock = Substitute.For<ICorrelationIdFactory>();
         _correlationIdFactoryMock
-            .Setup(m => m.Create())
-            .Returns(() => GeneratedCorrelationId)
-            .Verifiable();
+            .Create()
+            .Returns(GeneratedCorrelationId);
 
         Logger serilogLogger = new LoggerConfiguration()
             .WriteTo.TestCorrelator()
@@ -37,7 +36,7 @@ protected CorrelationManagerTests()
 
         _sut = new CorrelationManager(
             new CorrelationContextFactory(_correlationContextAccessor),
-            _correlationIdFactoryMock.Object,
+            _correlationIdFactoryMock,
             _correlationContextAccessor,
             _logger
         );
@@ -269,7 +268,7 @@ public async Task When_running_correlated_task_with_correlation_id_should_use_it
                     return Task.CompletedTask;
                 });
 
-            _correlationIdFactoryMock.Verify(m => m.Create(), Times.Never);
+            _correlationIdFactoryMock.DidNotReceive().Create();
         }
 
         [Fact]
@@ -283,7 +282,7 @@ public async Task When_running_correlated_task_without_correlation_id_should_use
                 return Task.CompletedTask;
             });
 
-            _correlationIdFactoryMock.Verify();
+            _correlationIdFactoryMock.Received(1).Create();
         }
 
         [Fact]
@@ -576,7 +575,7 @@ public void When_running_correlated_action_with_correlation_id_should_use_it()
                     _correlationContextAccessor.CorrelationContext?.CorrelationId.Should().Be(correlationId);
                 });
 
-            _correlationIdFactoryMock.Verify(m => m.Create(), Times.Never);
+            _correlationIdFactoryMock.DidNotReceive().Create();
         }
 
         [Fact]
@@ -589,7 +588,7 @@ public void When_running_correlated_action_without_correlation_id_should_use_gen
                 _correlationContextAccessor.CorrelationContext?.CorrelationId.Should().Be(GeneratedCorrelationId);
             });
 
-            _correlationIdFactoryMock.Verify();
+            _correlationIdFactoryMock.Received(1).Create();
         }
 
         [Fact]
@@ -672,10 +671,10 @@ public void Given_null_argument_when_executing_it_should_throw(params object[] a
         public static IEnumerable<object[]> NullArgumentTestCases()
         {
             var instance = new CorrelationManager(
-                Mock.Of<ICorrelationContextFactory>(),
-                Mock.Of<ICorrelationIdFactory>(),
-                Mock.Of<ICorrelationContextAccessor>(),
-                Mock.Of<ILogger<CorrelationManager>>()
+                Substitute.For<ICorrelationContextFactory>(),
+                Substitute.For<ICorrelationIdFactory>(),
+                Substitute.For<ICorrelationContextAccessor>(),
+                Substitute.For<ILogger<CorrelationManager>>()
             );
 
             static Task CorrelatedTask()

diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets
@@ -7,13 +7,13 @@
 
   <ItemGroup>
     <Using Include="FluentAssertions" />
-    <Using Include="Moq" />
+    <Using Include="NSubstitute" />
     <Using Include="Xunit" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    <PackageReference Include="Moq" Version="[4.18.2]" />
+    <PackageReference Include="NSubstitute" Version="5.0.0" />
     <PackageReference Include="xunit" Version="2.4.2" />
   </ItemGroup>