Replace Moq with NSubstitute (#123)

https://github.com/moq/moq/issues/1372
Hochfrequenz · Aug 10, 2023 · fc1e3ac · fc1e3ac
1 parent 3a1decb
commit fc1e3ac
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 24 deletions.
diff --git a/EDILibraryTests/EDILibraryTests.csproj b/EDILibraryTests/EDILibraryTests.csproj
@@ -7,10 +7,10 @@
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="6.11.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
-        <PackageReference Include="Moq" Version="4.20.1" />
         <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
         <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
         <PackageReference Include="coverlet.collector" Version="6.0.0" />
+        <PackageReference Include="NSubstitute" Version="5.0.0" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/EDILibraryTests/EdifactFormatVersionTests.cs b/EDILibraryTests/EdifactFormatVersionTests.cs
@@ -3,6 +3,7 @@
 using EDILibrary;
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NSubstitute;
 
 namespace EDILibraryTests
 {
@@ -128,9 +129,9 @@ private EdifactFormatVersion ActualCode(IEdifactFormatVersionProvider versionPro
         [TestMethod]
         public void TestMockingVersionProvider()
         {
-            var versionProviderMock = new Moq.Mock<IEdifactFormatVersionProvider>();
-            versionProviderMock.Setup(vp => vp.GetCurrent()).Returns(EdifactFormatVersion.FV1904);
-            Assert.AreEqual(EdifactFormatVersion.FV1904, ActualCode(versionProviderMock.Object));
+            var versionProviderMock = Substitute.For<IEdifactFormatVersionProvider>();
+            versionProviderMock.GetCurrent().Returns(EdifactFormatVersion.FV1904);
+            Assert.AreEqual(EdifactFormatVersion.FV1904, ActualCode(versionProviderMock));
         }
 
         /// <summary>

diff --git a/EDILibraryTests/TemplateLoaderExtensionTests.cs b/EDILibraryTests/TemplateLoaderExtensionTests.cs
@@ -1,12 +1,11 @@
 using System;
-using System.Linq;
 using System.Threading.Tasks;
 using EDILibrary;
 using EDILibrary.Interfaces;
 using EDILibrary.MAUS;
 using FluentAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Moq;
+using NSubstitute;
 
 
 namespace EDILibraryTests
@@ -20,16 +19,14 @@ public class TemplateLoaderExtensionTests
         [TestMethod]
         public async Task TestLoadingRegularTemplateIfExists()
         {
-            var loaderMock = new Mock<ITemplateLoader>();
-            loaderMock.Setup(l => l.LoadMausTemplate(EdifactFormat.MSCONS, EdifactFormatVersion.FV2304, "13002")).ReturnsAsync(new Anwendungshandbuch()).Verifiable();
+            var loaderMock = Substitute.For<ITemplateLoader>();
+            loaderMock.LoadMausTemplate(EdifactFormat.MSCONS, EdifactFormatVersion.FV2304, "13002").Returns(Task.FromResult(new Anwendungshandbuch()));
 
-            var loaderUnderTest = loaderMock.Object;
-            var (actualMaus, actualFormatVersion) = await loaderUnderTest.LoadMausTemplateOrFallback(EdifactFormat.MSCONS, EdifactFormatVersion.FV2304, "13002");
+            var (actualMaus, actualFormatVersion) = await loaderMock.LoadMausTemplateOrFallback(EdifactFormat.MSCONS, EdifactFormatVersion.FV2304, "13002");
             actualMaus.Should().NotBeNull();
             actualFormatVersion.Should().Be(EdifactFormatVersion.FV2304);
 
-            loaderMock.VerifyAll();
-            loaderMock.VerifyNoOtherCalls();
+            loaderMock.Received();
         }
 
         /// <summary>
@@ -38,18 +35,17 @@ public async Task TestLoadingRegularTemplateIfExists()
         [TestMethod]
         public async Task TestLoadingFallbackTemplateIfExists()
         {
-            var loaderMock = new Mock<ITemplateLoader>();
-            loaderMock.Setup(l => l.LoadMausTemplate(EdifactFormat.MSCONS, EdifactFormatVersion.FV2304, "13002")).ReturnsAsync((Anwendungshandbuch)null).Verifiable();
-            loaderMock.Setup(l => l.LoadMausTemplate(EdifactFormat.MSCONS, EdifactFormatVersion.FV2210, "13002")).ReturnsAsync((Anwendungshandbuch)null).Verifiable();
-            loaderMock.Setup(l => l.LoadMausTemplate(EdifactFormat.MSCONS, EdifactFormatVersion.FV2110, "13002")).ReturnsAsync(new Anwendungshandbuch()).Verifiable();
+            var loaderMock = Substitute.For<ITemplateLoader>();
+            loaderMock.LoadMausTemplate(EdifactFormat.MSCONS, EdifactFormatVersion.FV2304, "13002").Returns(Task.FromResult((Anwendungshandbuch)null));
+            loaderMock.LoadMausTemplate(EdifactFormat.MSCONS, EdifactFormatVersion.FV2210, "13002").Returns(Task.FromResult((Anwendungshandbuch)null));
+            loaderMock.LoadMausTemplate(EdifactFormat.MSCONS, EdifactFormatVersion.FV2110, "13002").Returns(Task.FromResult(new Anwendungshandbuch()));
 
-            var loaderUnderTest = loaderMock.Object;
+            var loaderUnderTest = loaderMock;
             var (actualMaus, actualFormatVersion) = await loaderUnderTest.LoadMausTemplateOrFallback(EdifactFormat.MSCONS, EdifactFormatVersion.FV2304, "13002");
             actualMaus.Should().NotBeNull();
             actualFormatVersion.Should().Be(EdifactFormatVersion.FV2110);
 
-            loaderMock.VerifyAll();
-            loaderMock.VerifyNoOtherCalls();
+            loaderMock.Received();
         }
 
         /// <summary>
@@ -58,16 +54,15 @@ public async Task TestLoadingFallbackTemplateIfExists()
         [TestMethod]
         public async Task TestLoadingNothingIfNotEvenAFallbackExists()
         {
-            var loaderMock = new Mock<ITemplateLoader>();
-            loaderMock.Setup(l => l.LoadMausTemplate(EdifactFormat.MSCONS, It.IsAny<EdifactFormatVersion>(), "13002")).ReturnsAsync((Anwendungshandbuch)null).Verifiable();
+            var loaderMock = Substitute.For<ITemplateLoader>();
+            loaderMock.LoadMausTemplate(EdifactFormat.MSCONS, Arg.Any<EdifactFormatVersion>(), "13002").Returns(Task.FromResult((Anwendungshandbuch)null));
 
 
-            var loaderUnderTest = loaderMock.Object;
-            var (actualMaus, actualFormatVersion) = await loaderUnderTest.LoadMausTemplateOrFallback(EdifactFormat.MSCONS, EdifactFormatVersion.FV2304, "13002");
+            var (actualMaus, actualFormatVersion) = await loaderMock.LoadMausTemplateOrFallback(EdifactFormat.MSCONS, EdifactFormatVersion.FV2304, "13002");
             actualMaus.Should().BeNull();
             actualFormatVersion.Should().BeNull();
 
-            loaderMock.VerifyAll();
+            loaderMock.ReceivedCalls();
         }
     }
 }