Add unit tests for ConsumerInvoker

src/DotNetCore.CAP/CAP.ServiceCollectionExtensions.cs

@@ -22,6 +22,7 @@ namespace Microsoft.Extensions.DependencyInjection
     public static class ServiceCollectionExtensions
     {
         internal static IServiceCollection ServiceCollection;
+
         /// <summary>
         /// Adds and configures the consistence services for the consistency.
         /// </summary>

src/DotNetCore.CAP/Internal/IConsumerInvoker.Default.cs

@@ -3,7 +3,6 @@
 
 using System;
 using System.Linq;
-using System.Reflection;
 using System.Threading.Tasks;
 using DotNetCore.CAP.Abstractions;
 using Microsoft.Extensions.DependencyInjection;
@@ -41,18 +40,19 @@ namespace DotNetCore.CAP.Internal
             using (var scope = _serviceProvider.CreateScope())
             {
                 var provider = scope.ServiceProvider;
-                var serviceType = context.ConsumerDescriptor.ImplTypeInfo.AsType();
+                var srvType = context.ConsumerDescriptor.ServiceTypeInfo?.AsType();
+                var implType = context.ConsumerDescriptor.ImplTypeInfo.AsType();
+
                 object obj = null;
 
-                if (context.ConsumerDescriptor.ServiceTypeInfo != null)
+                if (srvType != null)
                 {
-                    obj = provider.GetServices(context.ConsumerDescriptor.ServiceTypeInfo.AsType())
-                        .FirstOrDefault(o => o.GetType() == serviceType);
+                    obj = provider.GetServices(srvType).FirstOrDefault(o => o.GetType() == implType);
                 }
 
                 if (obj == null)
                 {
-                    obj = ActivatorUtilities.GetServiceOrCreateInstance(provider, serviceType);
+                    obj = ActivatorUtilities.GetServiceOrCreateInstance(provider, implType);
                 }
 
                 var jsonContent = context.DeliverMessage.Content;

test/DotNetCore.CAP.Test/ConsumerInvokerTest.cs

+using System;
+using System.Reflection;
+using System.Threading.Tasks;
+using DotNetCore.CAP.Abstractions;
+using DotNetCore.CAP.Infrastructure;
+using DotNetCore.CAP.Models;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Moq;
+using Xunit;
+
+namespace DotNetCore.CAP.Test
+{
+    public class ConsumerInvokerTest
+    {
+        private ILoggerFactory _loggerFactory;
+        private Mock<IMessagePacker> _mockMessagePacker;
+        private Mock<IModelBinderFactory> _mockModelBinderFactory;
+        private MessageContext _messageContext;
+
+        public ConsumerInvokerTest()
+        {
+            _loggerFactory = new NullLoggerFactory();
+            _mockMessagePacker = new Mock<IMessagePacker>();
+            _mockModelBinderFactory = new Mock<IModelBinderFactory>();
+        }
+
+        private Internal.DefaultConsumerInvoker InitDefaultConsumerInvoker(IServiceProvider provider)
+        {
+            var invoker = new Internal.DefaultConsumerInvoker(
+             _loggerFactory,
+             provider,
+             _mockMessagePacker.Object,
+             _mockModelBinderFactory.Object);
+
+            var message = new CapReceivedMessage
+            {
+                Id = SnowflakeId.Default().NextId(),
+                Name = "test",
+                Content = DateTime.Now.ToString(),
+                StatusName = StatusName.Scheduled,
+                Group = "Group.Test"
+            };
+
+            _mockMessagePacker
+                .Setup(x => x.UnPack(It.IsAny<string>()))
+                .Returns(new CapMessageDto(message.Content));
+
+            _messageContext = new MessageContext
+            {
+                Group = message.Group,
+                Name = message.Name,
+                Content = Helper.ToJson(message)
+            };
+
+            return invoker;
+        }
+
+        [Fact]
+        public async Task CanInvokeServiceTest()
+        {
+            var services = new ServiceCollection();
+
+            services.AddSingleton<ITestService, TestService2>();
+            services.AddSingleton<ITestService, TestService>();
+
+            var provider = services.BuildServiceProvider();
+
+            var invoker = InitDefaultConsumerInvoker(provider);
+
+            var descriptor = new ConsumerExecutorDescriptor
+            {
+                ServiceTypeInfo = typeof(ITestService).GetTypeInfo(),
+                ImplTypeInfo = typeof(TestService).GetTypeInfo(),
+                MethodInfo = typeof(TestService).GetMethod("Index")
+            };
+
+            descriptor.Attribute = descriptor.MethodInfo.GetCustomAttribute<TopicAttribute>(true);
+
+            var context = new Internal.ConsumerContext(descriptor, _messageContext);
+
+            var result = await invoker.InvokeAsync(context);
+
+            Assert.NotNull(result);
+            Assert.NotNull(result.Result);
+            Assert.Equal("test", result.Result.ToString());
+        }
+
+        [Fact]
+        public async Task CanInvokeControllerTest()
+        {
+            var services = new ServiceCollection();
+            var provider = services.BuildServiceProvider();
+            var invoker = InitDefaultConsumerInvoker(provider);
+
+            var descriptor = new ConsumerExecutorDescriptor
+            {
+                ServiceTypeInfo = typeof(HomeController).GetTypeInfo(),
+                ImplTypeInfo = typeof(HomeController).GetTypeInfo(),
+                MethodInfo = typeof(HomeController).GetMethod("Index")
+            };
+
+            descriptor.Attribute = descriptor.MethodInfo.GetCustomAttribute<TopicAttribute>(true);
+
+            var context = new Internal.ConsumerContext(descriptor, _messageContext);
+
+            var result = await invoker.InvokeAsync(context);
+
+            Assert.NotNull(result);
+            Assert.NotNull(result.Result);
+            Assert.Equal("test", result.Result.ToString());
+        }
+
+    }
+
+    public class HomeController
+    {
+        [CapSubscribe("test")]
+        public string Index()
+        {
+            return "test";
+        }
+    }
+
+    public interface ITestService { }
+
+    public class TestService : ITestService, ICapSubscribe
+    {
+        [CapSubscribe("test")]
+        public string Index()
+        {
+            return "test";
+        }
+    }
+
+    public class TestService2 : ITestService
+    {
+        [CapSubscribe("test")]
+        public string Index()
+        {
+            return "test2";
+        }
+    }
+
+    public class CapSubscribeAttribute : TopicAttribute
+    {
+        public CapSubscribeAttribute(string name) : base(name)
+        {
+        }
+    }
+}
\ No newline at end of file

test/DotNetCore.CAP.Test/SubscribeFinderTest.cs

-using System;
-using DotNetCore.CAP.Abstractions;
-using Microsoft.Extensions.DependencyInjection;
-using Xunit;
-
-namespace DotNetCore.CAP.Test
-{
-    public class SubscribeFinderTest
-    {
-        private IServiceProvider _provider;
-
-        public SubscribeFinderTest()
-        {
-            var services = new ServiceCollection();
-            services.AddScoped<ITestService, TestService>();
-            services.AddCap(x => { });
-            _provider = services.BuildServiceProvider();
-        }
-
-        [Fact]
-        public void CanFindControllers()
-        {
-        }
-
-        [Fact]
-        public void CanFindSubscribeService()
-        {
-            var testService = _provider.GetService<ICapSubscribe>();
-            Assert.NotNull(testService);
-            Assert.IsType<TestService>(testService);
-        }
-    }
-
-    public class HomeController
-    {
-    }
-
-    public interface ITestService { }
-
-    public class TestService : ITestService, ICapSubscribe
-    {
-        [CapSubscribe("test")]
-        public void Index()
-        {
-        }
-    }
-
-    public class CapSubscribeAttribute : TopicAttribute
-    {
-        public CapSubscribeAttribute(string name) : base(name)
-        {
-        }
-    }
-}
\ No newline at end of file