Merge pull request #1390 from aydjay/ajones-NSubstitute

Replace MOQ with NSubstitute

Author: tillig

test/Autofac.Test/Autofac.Test.csproj

@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Using Include="Moq" />
+    <Using Include="NSubstitute" />
     <Using Include="Xunit" />
   </ItemGroup>
 
@@ -44,7 +44,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-    <PackageReference Include="Moq" Version="4.18.4" />
+    <PackageReference Include="NSubstitute" Version="5.0.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

test/Autofac.Test/Core/Resolving/Middleware/CircularDependencyMiddlewareTests.cs

@@ -11,12 +11,12 @@ public class CircularDependencyMiddlewareTests
     [Fact]
     public void NextCalled_OperationIsNotIDependencyTrackingResolveOperation_MiddlewareSkipped()
     {
-        var resolveRequestContextMock = new Mock<ResolveRequestContext>();
+        var resolveRequestContextMock = Substitute.For<ResolveRequestContext>();
         var middleware =
             new CircularDependencyDetectorMiddleware(CircularDependencyDetectorMiddleware.DefaultMaxResolveDepth);
 
-        middleware.Execute(resolveRequestContextMock.Object, context => { });
+        middleware.Execute(resolveRequestContextMock, context => { });
 
-        resolveRequestContextMock.Verify(context => context.Operation.RequestDepth, Times.Never);
+        resolveRequestContextMock.Received();
     }
 }

test/Autofac.Test/Core/Resolving/ResolveOperationTests.cs

@@ -19,14 +19,14 @@ public void NullLifetimeScope_ThrowsArgumentNullException()
     [Fact]
     public void NullDiagnosticSource_ThrowsArgumentNullException()
     {
-        var ex = Assert.Throws<ArgumentNullException>(() => new ResolveOperation(Mock.Of<ISharingLifetimeScope>(), null!));
+        var ex = Assert.Throws<ArgumentNullException>(() => new ResolveOperation(Substitute.For<ISharingLifetimeScope>(), null!));
         Assert.Contains("(Parameter 'diagnosticSource')", ex.Message);
     }
 
     [Fact]
     public void EmptyInProgressRequestWhenInitializing()
     {
-        var resolveOperation = new ResolveOperation(Mock.Of<ISharingLifetimeScope>(), new DiagnosticListener("SomeName"));
+        var resolveOperation = new ResolveOperation(Substitute.For<ISharingLifetimeScope>(), new DiagnosticListener("SomeName"));
 
         var inProgressStack = resolveOperation.InProgressRequests;
 
@@ -36,7 +36,7 @@ public void EmptyInProgressRequestWhenInitializing()
     [Fact]
     public void GetOrCreateInstanceThrowsArgumentNullExceptionWhenResolveRequestIsNull()
     {
-        var lifetimeScope = Mock.Of<ISharingLifetimeScope>();
+        var lifetimeScope = Substitute.For<ISharingLifetimeScope>();
         var resolveOperation = new ResolveOperation(lifetimeScope, new DiagnosticListener("SomeName"));
 
         Assert.Throws<ArgumentNullException>(() => resolveOperation.GetOrCreateInstance(lifetimeScope, null!));

test/Autofac.Test/Diagnostics/DiagnosticSourceExtensionsTests.cs

@@ -20,7 +20,7 @@ public void MiddlewareFailure_CorrectEventContent()
         source.Subscribe(subscriber, subscriber.IsEnabled);
 
         var context = MockResolveRequestContext();
-        source.MiddlewareFailure(context, Mock.Of<IResolveMiddleware>());
+        source.MiddlewareFailure(context, Substitute.For<IResolveMiddleware>());
         var e = Assert.Single(subscriber.Events);
         Assert.Equal(DiagnosticEventKeys.MiddlewareFailure, e.Key);
         Assert.IsType<MiddlewareDiagnosticData>(e.Value);
@@ -35,7 +35,7 @@ public void MiddlewareStart_CorrectEventContent()
         source.Subscribe(subscriber, subscriber.IsEnabled);
 
         var context = MockResolveRequestContext();
-        source.MiddlewareStart(context, Mock.Of<IResolveMiddleware>());
+        source.MiddlewareStart(context, Substitute.For<IResolveMiddleware>());
         var e = Assert.Single(subscriber.Events);
         Assert.Equal(DiagnosticEventKeys.MiddlewareStart, e.Key);
         Assert.IsType<MiddlewareDiagnosticData>(e.Value);
@@ -50,7 +50,7 @@ public void MiddlewareSuccess_CorrectEventContent()
         source.Subscribe(subscriber, subscriber.IsEnabled);
 
         var context = MockResolveRequestContext();
-        source.MiddlewareSuccess(context, Mock.Of<IResolveMiddleware>());
+        source.MiddlewareSuccess(context, Substitute.For<IResolveMiddleware>());
         var e = Assert.Single(subscriber.Events);
         Assert.Equal(DiagnosticEventKeys.MiddlewareSuccess, e.Key);
         Assert.IsType<MiddlewareDiagnosticData>(e.Value);
@@ -161,7 +161,7 @@ private static ResolveRequest MockResolveRequest()
     {
         return new ResolveRequest(
             new TypedService(typeof(string)),
-            new ServiceRegistration(Mock.Of<IResolvePipeline>(), Mock.Of<IComponentRegistration>()),
+            new ServiceRegistration(Substitute.For<IResolvePipeline>(), Substitute.For<IComponentRegistration>()),
             Enumerable.Empty<Parameter>());
     }
 

test/Autofac.Test/Features/Decorators/DecoratorMiddlewareTests.cs

@@ -14,19 +14,19 @@ public class DecoratorMiddlewareTests
     public void ResolveOperationDoesNotImplementIDependencyTrackingResolveOperation_DecoratorMiddlewareStoppedEarly()
     {
         var decoratorService = new DecoratorService(typeof(object));
-        var middleware = new DecoratorMiddleware(decoratorService, Mock.Of<IComponentRegistration>());
-        var contextMock = new Mock<ResolveRequestContext>();
-        var registrationMock = new Mock<IComponentRegistration>();
-        contextMock.Setup(context => context.Instance).Returns(new object());
-        contextMock.Setup(context => context.Registration).Returns(registrationMock.Object);
-        registrationMock.Setup(registration => registration.Options).Returns(RegistrationOptions.None);
+        var middleware = new DecoratorMiddleware(decoratorService, Substitute.For<IComponentRegistration>());
+        var contextMock = Substitute.For<ResolveRequestContext>();
+        var registrationMock = Substitute.For<IComponentRegistration>();
+        contextMock.Instance.Returns(new object());
+        contextMock.Registration.Returns(registrationMock);
+        registrationMock.Options.Returns(RegistrationOptions.None);
 
-        middleware.Execute(contextMock.Object, context => { });
+        middleware.Execute(contextMock, context => { });
 
-        contextMock.Verify(context => context.Instance, Times.Once);
-        contextMock.Verify(context => context.Registration.Options, Times.Once);
+        contextMock.Received(1);
+        registrationMock.Received(1);
 
         // never got further because IResolveOperation is not of type IDependencyTrackingResolveOperation
-        contextMock.Verify(context => context.Service, Times.Never);
+        contextMock.DidNotReceive();
     }
 }

test/Autofac.Test/Util/Cache/TypeAssemblyReferenceProviderTests.cs

@@ -17,7 +17,7 @@ public class TypeAssemblyReferenceProviderTests
     [InlineData(typeof(IEnumerable<ContainerBuilder[]>), new[] { typeof(IEnumerable<>), typeof(ContainerBuilder) })]
     [InlineData(typeof(IEnumerable<IIndex<int, Assert>>), new[] { typeof(IEnumerable<>), typeof(IIndex<,>), typeof(Assert) })]
     [InlineData(typeof(DerivedClass), new[] { typeof(DerivedClass), typeof(RegistrationBuilder<,,>), typeof(Assert) })]
-    [InlineData(typeof(GenericDerivedClass<Assert>), new[] { typeof(DerivedClass), typeof(RegistrationBuilder<,,>), typeof(Assert), typeof(Mock) })]
+    [InlineData(typeof(GenericDerivedClass<Assert>), new[] { typeof(DerivedClass), typeof(RegistrationBuilder<,,>), typeof(Assert), typeof(object) })]
     public void TypeReferencesCanBeDetermined(Type inputType, Type[] expandedTypeAssemblies)
     {
         var set = TypeAssemblyReferenceProvider.GetAllReferencedAssemblies(inputType);
@@ -59,7 +59,7 @@ public DerivedClass(Service defaultService, SimpleActivatorData activatorData, S
     }
 
     private class GenericDerivedClass<T>
-        : RegistrationBuilder<IIndex<T, Mock>, SimpleActivatorData, SingleRegistrationStyle>
+        : RegistrationBuilder<IIndex<T, object>, SimpleActivatorData, SingleRegistrationStyle>
     {
         public GenericDerivedClass(Service defaultService, SimpleActivatorData activatorData, SingleRegistrationStyle style)
             : base(defaultService, activatorData, style)