Update packages and fixed failing unit test (assemblies not passed) (#7)

mvput · web-flow · commit 2e30cfce0cb8 · 2018-04-09T10:39:03.000+02:00
diff --git a/Src/Xer.Cqrs.Extensions.Autofac/CqrsBuilder.cs b/Src/Xer.Cqrs.Extensions.Autofac/CqrsBuilder.cs
@@ -5,7 +5,7 @@
 using Xer.Cqrs.CommandStack;
 using Xer.Cqrs.EventStack;
 using Xer.Delegator;
-using Xer.Delegator.Registrations;
+using Xer.Delegator.Registration;
 using Xer.Delegator.Resolvers;
 
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Xer.Cqrs.Extensions.Autofac.Tests")]
diff --git a/Src/Xer.Cqrs.Extensions.Autofac/CqrsCommandHandlerSelector.cs b/Src/Xer.Cqrs.Extensions.Autofac/CqrsCommandHandlerSelector.cs
@@ -3,9 +3,10 @@
 using System.Linq;
 using System.Reflection;
 using Xer.Cqrs.CommandStack;
+using Xer.Cqrs.CommandStack.Extensions.Attributes;
 using Xer.Cqrs.CommandStack.Resolvers;
 using Xer.Delegator;
-using Xer.Delegator.Registrations;
+using Xer.Delegator.Registration;
 using Xer.Delegator.Resolvers;
 
 namespace Xer.Cqrs.Extensions.Autofac
@@ -112,7 +113,7 @@ public ICqrsCommandHandlerSelector ByAttribute(Lifetime lifetime, params Assembl
             _builder.Register(context =>
             {
                 SingleMessageHandlerRegistration singleMessageHandlerRegistration = new SingleMessageHandlerRegistration();
-                singleMessageHandlerRegistration.RegisterCommandHandlerAttributes(assemblies, context.Resolve);
+                singleMessageHandlerRegistration.RegisterCommandHandlersByAttribute(assemblies, context.Resolve);
                 return new CommandHandlerDelegateResolver(singleMessageHandlerRegistration.BuildMessageHandlerResolver());
             }).AsSelf().SingleInstance();
 
diff --git a/Src/Xer.Cqrs.Extensions.Autofac/CqrsEventHandlerSelector.cs b/Src/Xer.Cqrs.Extensions.Autofac/CqrsEventHandlerSelector.cs
@@ -3,9 +3,11 @@
 using System.Linq;
 using System.Reflection;
 using Xer.Cqrs.EventStack;
+using Xer.Cqrs.EventStack.Extensions.Attributes;
 using Xer.Cqrs.EventStack.Resolvers;
 using Xer.Delegator;
-using Xer.Delegator.Registrations;
+using Xer.Delegator.Registration;
+using Xer.Delegator.Resolvers;
 
 namespace Xer.Cqrs.Extensions.Autofac
 {
@@ -108,7 +110,7 @@ public ICqrsEventHandlerSelector ByAttribute(Lifetime lifetime, params Assembly[
             _builder.Register(context =>
             {
                 var handlerRegistration = new MultiMessageHandlerRegistration();
-                handlerRegistration.RegisterEventHandlerAttributes(assemblies, context.Resolve);
+                handlerRegistration.RegisterEventHandlersByAttribute(assemblies, context.Resolve);
                 return new EventHandlerDelegateResolver(handlerRegistration.BuildMessageHandlerResolver());
             }).AsSelf().SingleInstance();
 
diff --git a/Src/Xer.Cqrs.Extensions.Autofac/Xer.Cqrs.Extensions.Autofac.csproj b/Src/Xer.Cqrs.Extensions.Autofac/Xer.Cqrs.Extensions.Autofac.csproj
@@ -7,8 +7,11 @@
   <ItemGroup>
     <PackageReference Include="Autofac" Version="4.6.2" />
     <PackageReference Include="Scrutor" Version="2.2.2" />
-    <PackageReference Include="Xer.Cqrs.CommandStack" Version="1.0.0" />
-    <PackageReference Include="Xer.Cqrs.EventStack" Version="1.0.0" />
+    <PackageReference Include="Xer.Cqrs.CommandStack" Version="2.0.0" />
+    <PackageReference Include="Xer.Cqrs.CommandStack.Extensions.Attributes" Version="1.0.0" />
+    <PackageReference Include="Xer.Cqrs.EventStack" Version="2.0.0" />
+    <PackageReference Include="Xer.Cqrs.EventStack.Extensions.Attributes" Version="1.0.0" />
+    <PackageReference Include="Xer.Delegator" Version="1.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/Tests/Xer.Cqrs.Extensions.Autofac.Tests/CommandHandlerTests.cs b/Tests/Xer.Cqrs.Extensions.Autofac.Tests/CommandHandlerTests.cs
@@ -1,7 +1,4 @@
 using Autofac;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 using Autofac.Core.Registration;
 using Xer.Cqrs.CommandStack;
@@ -12,19 +9,12 @@ namespace Xer.Xqrs.Extensions.Autofac.Tests
 {
     public class CommandHandlerTests
     {
-        private readonly Assembly _assembly;
-
-        public CommandHandlerTests()
-        {
-            this._assembly = typeof(TestCommand).Assembly;
-        }
-
         [Fact]
         public void Should_Resolve_CommandDelegator()
         {
             ContainerBuilder builder = new ContainerBuilder();
             builder.RegisterCqrsCore()
-                .RegisterCommandHandlers(select => select.ByInterface(_assembly));
+                .RegisterCommandHandlers(select => select.ByInterface(typeof(TestCommand).Assembly));
 
             var context = builder.Build();
 
@@ -47,7 +37,7 @@ public void Should_Resolve_CommandHandler_ByInterface()
         {
             ContainerBuilder builder = new ContainerBuilder();
             builder.RegisterCqrsCore()
-                .RegisterCommandHandlers(opt => opt.ByInterface(_assembly));
+                .RegisterCommandHandlers(opt => opt.ByInterface(typeof(TestCommand).Assembly));
 
             var context = builder.Build();
 
@@ -61,33 +51,19 @@ public void Should_Resolve_CommandHandler_ByAttribute()
         {
             ContainerBuilder builder = new ContainerBuilder();
             builder.RegisterCqrsCore()
-                .RegisterCommandHandlers(opt => opt.ByAttribute(_assembly));
+                .RegisterCommandHandlers(opt => opt.ByAttribute(typeof(TestCommand).Assembly));
 
             var context = builder.Build();
 
             Assert.NotNull(context.Resolve<TestCommandHandlerWithAttribute>());
         }
 
-        [Fact]
-        public void Should_Resolve_Multiple_CommandHandlers_ByInterface()
-        {
-            ContainerBuilder builder = new ContainerBuilder();
-            builder.RegisterCqrsCore()
-                .RegisterCommandHandlers(opt => opt.ByInterface(_assembly));
-
-            var context = builder.Build();
-
-            var commandHandler = context.Resolve<IEnumerable<ICommandAsyncHandler<MultipleCommand>>>();
-
-            Assert.Equal(2, commandHandler.Count());
-        }
-
         [Fact]
         public void Should_Resolve_Multiple_CommandHandlers_ByAttribute()
         {
             ContainerBuilder builder = new ContainerBuilder();
             builder.RegisterCqrsCore()
-                .RegisterCommandHandlers(opt => opt.ByAttribute(_assembly));
+                .RegisterCommandHandlers(opt => opt.ByAttribute(typeof(TestCommand).Assembly));
 
             var context = builder.Build();
 
diff --git a/Tests/Xer.Cqrs.Extensions.Autofac.Tests/MultipleCommandHandlerWithAttribute1.cs b/Tests/Xer.Cqrs.Extensions.Autofac.Tests/MultipleCommandHandlerWithAttribute1.cs
@@ -1,6 +1,6 @@
 using System.Threading;
 using System.Threading.Tasks;
-using Xer.Cqrs.CommandStack.Attributes;
+using Xer.Cqrs.CommandStack.Extensions.Attributes;
 
 namespace Xer.Xqrs.Extensions.Autofac.Tests
 {
diff --git a/Tests/Xer.Cqrs.Extensions.Autofac.Tests/MultipleCommandHandlerWithAttribute2.cs b/Tests/Xer.Cqrs.Extensions.Autofac.Tests/MultipleCommandHandlerWithAttribute2.cs
@@ -1,6 +1,6 @@
 using System.Threading;
 using System.Threading.Tasks;
-using Xer.Cqrs.CommandStack.Attributes;
+using Xer.Cqrs.CommandStack.Extensions.Attributes;
 
 namespace Xer.Xqrs.Extensions.Autofac.Tests
 {
diff --git a/Tests/Xer.Cqrs.Extensions.Autofac.Tests/TestCommandHandlerWithAttribute.cs b/Tests/Xer.Cqrs.Extensions.Autofac.Tests/TestCommandHandlerWithAttribute.cs
@@ -1,6 +1,6 @@
 using System.Threading;
 using System.Threading.Tasks;
-using Xer.Cqrs.CommandStack.Attributes;
+using Xer.Cqrs.CommandStack.Extensions.Attributes;
 
 namespace Xer.Xqrs.Extensions.Autofac.Tests
 {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using System.Threading;`
`2`	`2`	`using System.Threading.Tasks;`
`3`		`-using Xer.Cqrs.CommandStack.Attributes;`
	`3`	`+using Xer.Cqrs.CommandStack.Extensions.Attributes;`
`4`	`4`
`5`	`5`	`namespace Xer.Xqrs.Extensions.Autofac.Tests`
`6`	`6`	`{`