#680 - Remove Moq.

sys27 · Aug 9, 2023 · 0bb61e4 · 0bb61e4
1 parent 47ed194
commit 0bb61e4
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 31 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -2,13 +2,13 @@
   <ItemGroup>
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
     <PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.133" />
+    <PackageVersion Include="NSubstitute" Version="5.0.0" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.507" />
     <PackageVersion Include="System.Collections.Immutable" Version="7.0.0" />
     <PackageVersion Include="CommandLineParser" Version="2.9.1" />
     <PackageVersion Include="BenchmarkDotNet" Version="0.13.7" />
     <PackageVersion Include="coverlet.msbuild" Version="6.0.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
-    <PackageVersion Include="Moq" Version="4.18.4" />
     <PackageVersion Include="ReportGenerator" Version="5.1.23" />
     <PackageVersion Include="xunit" Version="2.5.0" />
     <PackageVersion Include="xunit.analyzers" Version="1.2.0" />

diff --git a/xFunc.Tests/Expressions/DelTest.cs b/xFunc.Tests/Expressions/DelTest.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Dmytro Kyshchenko. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using Moq;
+using NSubstitute;
 
 namespace xFunc.Tests.Expressions;
 
@@ -14,7 +14,7 @@ public void DifferentiatorNull()
     [Fact]
     public void SimplifierNull()
     {
-        var differentiator = new Mock<IDifferentiator>().Object;
+        var differentiator = Substitute.For<IDifferentiator>();
 
         Assert.Throws<ArgumentNullException>(() => new Del(differentiator, null, null));
     }
@@ -63,11 +63,11 @@ public void ExecuteTest2()
     [Fact]
     public void ExecuteNonLambdaTest()
     {
-        var differentiator = new Mock<IDifferentiator>();
-        var simplifier = new Mock<ISimplifier>();
+        var differentiator = Substitute.For<IDifferentiator>();
+        var simplifier = Substitute.For<ISimplifier>();
         var del = new Del(
-            differentiator.Object,
-            simplifier.Object,
+            differentiator,
+            simplifier,
             Number.One);
 
         Assert.Throws<ResultIsNotSupportedException>(() => del.Execute());

diff --git a/xFunc.Tests/Expressions/DerivativeTest.cs b/xFunc.Tests/Expressions/DerivativeTest.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Dmytro Kyshchenko. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using Moq;
+using NSubstitute;
 
 namespace xFunc.Tests.Expressions;
 
@@ -14,24 +14,24 @@ public void DifferentiatorNull()
     [Fact]
     public void SimplifierNull()
     {
-        var differentiator = new Mock<IDifferentiator>().Object;
+        var differentiator = Substitute.For<IDifferentiator>();
 
         Assert.Throws<ArgumentNullException>(() => new Derivative(differentiator, null, Variable.X));
     }
 
     [Fact]
     public void ExecutePointTest()
     {
-        var differentiator = new Mock<IDifferentiator>();
+        var differentiator = Substitute.For<IDifferentiator>();
         differentiator
-            .Setup(d => d.Analyze(It.IsAny<Variable>(), It.IsAny<DifferentiatorContext>()))
-            .Returns<Variable, DifferentiatorContext>((exp, _) => exp);
+            .Analyze(Arg.Any<Variable>(), Arg.Any<DifferentiatorContext>())
+            .Returns(info => info.Arg<Variable>());
 
-        var simplifier = new Mock<ISimplifier>();
+        var simplifier = Substitute.For<ISimplifier>();
 
         var deriv = new Derivative(
-            differentiator.Object,
-            simplifier.Object,
+            differentiator,
+            simplifier,
             Variable.X.ToLambdaExpression(),
             Variable.X,
             Number.Two);
@@ -42,11 +42,11 @@ public void ExecutePointTest()
     [Fact]
     public void ExecuteNonLambdaTest()
     {
-        var differentiator = new Mock<IDifferentiator>();
-        var simplifier = new Mock<ISimplifier>();
+        var differentiator = Substitute.For<IDifferentiator>();
+        var simplifier = Substitute.For<ISimplifier>();
         var derivative = new Derivative(
-            differentiator.Object,
-            simplifier.Object,
+            differentiator,
+            simplifier,
             Number.One);
 
         Assert.Throws<ResultIsNotSupportedException>(() => derivative.Execute());

diff --git a/xFunc.Tests/Expressions/SimplifyTest.cs b/xFunc.Tests/Expressions/SimplifyTest.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Dmytro Kyshchenko. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using Moq;
+using NSubstitute;
 
 namespace xFunc.Tests.Expressions;
 
@@ -14,22 +14,20 @@ public void SimplifierNull()
     [Fact]
     public void ExecuteTest()
     {
-        var mock = new Mock<ISimplifier>();
-        mock
-            .Setup(x => x.Analyze(It.IsAny<Sin>()))
-            .Returns<IExpression>(x => x);
+        var simplifier = Substitute.For<ISimplifier>();
+        simplifier.Analyze(Arg.Any<Sin>()).Returns(info => info.Arg<Sin>());
 
         var lambda = new Sin(Variable.X).ToLambda(Variable.X.Name);
-        var exp = new Simplify(mock.Object, lambda.AsExpression());
+        var exp = new Simplify(simplifier, lambda.AsExpression());
 
         Assert.Equal(lambda, exp.Execute());
     }
 
     [Fact]
     public void ExecuteNonLambdaTest()
     {
-        var simplifier = new Mock<ISimplifier>();
-        var simplify = new Simplify(simplifier.Object, Number.One);
+        var simplifier = Substitute.For<ISimplifier>();
+        var simplify = new Simplify(simplifier, Number.One);
 
         Assert.Throws<ResultIsNotSupportedException>(() => simplify.Execute());
     }

diff --git a/xFunc.Tests/ParserTests/LambdaTests.cs b/xFunc.Tests/ParserTests/LambdaTests.cs
@@ -1,5 +1,5 @@
 using System.Collections.Immutable;
-using Moq;
+using NSubstitute;
 
 namespace xFunc.Tests.ParserTests;
 
@@ -102,10 +102,10 @@ public void ParseInlineTwoParametersTest()
     [Fact]
     public void ParseFunctionWithCallExpression()
     {
-        var simplifier = new Mock<ISimplifier>();
+        var simplifier = Substitute.For<ISimplifier>();
         var expected = new CallExpression(
             new Simplify(
-                simplifier.Object,
+                simplifier,
                 new Mul(Variable.X, Variable.X).ToLambdaExpression(Variable.X.Name)),
             Number.One);
 

diff --git a/xFunc.Tests/xFunc.Tests.csproj b/xFunc.Tests/xFunc.Tests.csproj
@@ -54,7 +54,7 @@
   <ItemGroup>
     <PackageReference Include="coverlet.msbuild" PrivateAssets="All" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="Moq" />
+    <PackageReference Include="NSubstitute" />
     <PackageReference Include="ReportGenerator" />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.analyzers" />