RabbitMq: Configure has now additive effects (#78)

While configuring RabbitMQ, invoking Configure multiple times has additive effects
Nybus-project · Feb 21, 2019 · 1e7b07a · 1e7b07a
1 parent 9ffc6c2
commit 1e7b07a
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 13 deletions.
diff --git a/src/engines/Nybus.Engine.RabbitMq/Configuration/IRabbitMqConfigurator.cs b/src/engines/Nybus.Engine.RabbitMq/Configuration/IRabbitMqConfigurator.cs
@@ -34,11 +34,16 @@ public void RegisterQueueFactoryProvider<TProvider>(Func<IServiceProvider, IQueu
             }
         }
 
-        private Action<IRabbitMqConfiguration> _configurationAction;
+        private readonly List<Action<IRabbitMqConfiguration>> _configurationActions = new List<Action<IRabbitMqConfiguration>>();
 
         public void Configure(Action<IRabbitMqConfiguration> configure)
         {
-            _configurationAction = configure ?? throw new ArgumentNullException(nameof(configure));
+            if (configure == null)
+            {
+                throw new ArgumentNullException(nameof(configure));
+            }
+
+            _configurationActions.Add(configure);
         }
 
         private string _configurationSectionName;
@@ -67,7 +72,10 @@ public void Apply(INybusConfigurator nybus)
 
                 var configuration = factory.Create(op);
 
-                _configurationAction?.Invoke(configuration);
+                foreach (var configurationAction in _configurationActions)
+                {
+                    configurationAction?.Invoke(configuration);
+                }
 
                 return configuration;
             }));

diff --git a/tests/Tests.Nybus.Engine.RabbitMq/Configuration/RabbitMqConfiguratorTests.cs b/tests/Tests.Nybus.Engine.RabbitMq/Configuration/RabbitMqConfiguratorTests.cs
@@ -31,12 +31,11 @@ public void RegisterQueueFactoryProvider_adds_provider_with_default_setup(Rabbit
         }
 
         [Test, CustomAutoMoqData]
-        public void RegisterQueueFactoryProvider_adds_provider_with_custom_setup(RabbitMqConfigurator sut, TestNybusConfigurator configurator, TestQueueFactoryProvider factoryProvider)
+        public void RegisterQueueFactoryProvider_adds_provider_with_custom_setup(RabbitMqConfigurator sut, TestNybusConfigurator configurator, TestQueueFactoryProvider factoryProvider, Func<IServiceProvider, IQueueFactoryProvider> setup)
         {
-            var setup = new Mock<Func<IServiceProvider, IQueueFactoryProvider>>();
-            setup.Setup(p => p(It.IsAny<IServiceProvider>())).Returns(factoryProvider);
+            Mock.Get(setup).Setup(p => p(It.IsAny<IServiceProvider>())).Returns(factoryProvider);
 
-            sut.RegisterQueueFactoryProvider<TestQueueFactoryProvider>(setup.Object);
+            sut.RegisterQueueFactoryProvider<TestQueueFactoryProvider>(setup);
 
             sut.Apply(configurator);
 
@@ -48,17 +47,37 @@ public void RegisterQueueFactoryProvider_adds_provider_with_custom_setup(RabbitM
 
             var provider = serviceProvider.GetService<IQueueFactoryProvider>();
 
-            setup.Verify(s => s(It.IsAny<IServiceProvider>()), Times.Once);
+            Mock.Get(setup).Verify(s => s(It.IsAny<IServiceProvider>()), Times.Once);
             Assert.That(provider, Is.SameAs(factoryProvider));
         }
 
         [Test, CustomAutoMoqData]
-        public void Configure_sets_action_to_be_used(RabbitMqConfigurator sut, TestNybusConfigurator configurator, IConfigurationFactory configurationFactory, RabbitMqOptions options)
+        public void Configure_sets_action_to_be_used(RabbitMqConfigurator sut, TestNybusConfigurator configurator, IConfigurationFactory configurationFactory, RabbitMqOptions options, Action<IRabbitMqConfiguration> configurationSetup)
         {
-            var configurationSetup = new Mock<Action<IRabbitMqConfiguration>>();
-            configurationSetup.Setup(p => p(It.IsAny<IRabbitMqConfiguration>()));
+            sut.Configure(configurationSetup);
 
-            sut.Configure(configurationSetup.Object);
+            sut.Apply(configurator);
+
+            var services = new ServiceCollection();
+            services.AddSingleton(configurationFactory);
+            services.AddSingleton(options);
+
+            configurator.ApplyServiceConfigurations(services);
+
+            var serviceProvider = services.BuildServiceProvider();
+
+            var configuration = serviceProvider.GetService<IRabbitMqConfiguration>();
+
+            Mock.Get(configurationSetup).Verify(p => p(configuration), Times.Once);
+        }
+
+        [Test, CustomAutoMoqData]
+        public void Configure_usages_are_additive(RabbitMqConfigurator sut, TestNybusConfigurator configurator, IConfigurationFactory configurationFactory, RabbitMqOptions options, Action<IRabbitMqConfiguration>[] configurationSetupActions)
+        {
+            foreach (var configurationSetup in configurationSetupActions)
+            {
+                sut.Configure(configurationSetup);
+            }
 
             sut.Apply(configurator);
 
@@ -72,7 +91,10 @@ public void Configure_sets_action_to_be_used(RabbitMqConfigurator sut, TestNybus
 
             var configuration = serviceProvider.GetService<IRabbitMqConfiguration>();
 
-            configurationSetup.Verify(p => p(configuration), Times.Once);
+            foreach (var configurationSetup in configurationSetupActions)
+            {
+                Mock.Get(configurationSetup).Verify(p => p(configuration), Times.Once);
+            }
         }
 
         [Test, CustomAutoMoqData]