Cleanup

rasmus · rasmus · commit cb96f854b13c · 2016-10-06T22:42:34.000+02:00
diff --git a/Source/EventFlow.RabbitMQ.Tests/Integration/RabbitMqTests.cs b/Source/EventFlow.RabbitMQ.Tests/Integration/RabbitMqTests.cs
@@ -64,8 +64,9 @@ public void SetUp()
         [Test, Timeout(10000)]
         public async Task Scenario()
         {
-            using (var consumer = new RabbitMqConsumer(_uri, "eventflow", new[] { "#" }))
-            using (var resolver = BuildResolver())
+            var exchange = new Exchange($"eventflow-{Guid.NewGuid():N}");
+            using (var consumer = new RabbitMqConsumer(_uri, exchange, new[] { "#" }))
+            using (var resolver = BuildResolver(exchange))
             {
                 var commandBus = resolver.Resolve<ICommandBus>();
                 var eventJsonSerializer = resolver.Resolve<IEventJsonSerializer>();
@@ -74,7 +75,7 @@ public async Task Scenario()
                 await commandBus.PublishAsync(new ThingyPingCommand(ThingyId.New, pingId), CancellationToken.None).ConfigureAwait(false);
 
                 var rabbitMqMessage = consumer.GetMessages(TimeSpan.FromMinutes(1)).Single();
-                rabbitMqMessage.Exchange.Value.Should().Be("eventflow");
+                rabbitMqMessage.Exchange.Value.Should().Be(exchange.Value);
                 rabbitMqMessage.RoutingKey.Value.Should().Be("eventflow.domainevent.thingy.thingy-ping.1");
 
                 var pingEvent = (IDomainEvent<ThingyAggregate, ThingyId, ThingyPingEvent>)eventJsonSerializer.Deserialize(
@@ -88,23 +89,24 @@ public async Task Scenario()
         [Test, Timeout(60000)]
         public async Task PublisherPerformance()
         {
-            var exchange = new Exchange("eventflow");
+            var exchange = new Exchange($"eventflow-{Guid.NewGuid():N}");
             var routingKey = new RoutingKey("performance");
             var exceptions = new ConcurrentBag<Exception>();
             const int taskCount = 100;
             const int messagesPrThread = 200;
+            const int totalMessageCount = taskCount*messagesPrThread;
 
-            using (var consumer = new RabbitMqConsumer(_uri, "eventflow", new[] {"#"}))
-            using (var resolver = BuildResolver(o => o.RegisterServices(sr => sr.Register<ILog, NullLog>())))
+            using (var consumer = new RabbitMqConsumer(_uri, exchange, new[] {"#"}))
+            using (var resolver = BuildResolver(exchange, o => o.RegisterServices(sr => sr.Register<ILog, NullLog>())))
             {
                 var rabbitMqPublisher = resolver.Resolve<IRabbitMqPublisher>();
                 var tasks = Enumerable.Range(0, taskCount)
                     .Select(i => Task.Run(() => SendMessagesAsync(rabbitMqPublisher, messagesPrThread, exchange, routingKey, exceptions)));
 
                 await Task.WhenAll(tasks).ConfigureAwait(false);
 
-                var rabbitMqMessages = consumer.GetMessages(TimeSpan.FromMinutes(1), taskCount * messagesPrThread);
-                rabbitMqMessages.Should().HaveCount(taskCount*messagesPrThread);
+                var rabbitMqMessages = consumer.GetMessages(TimeSpan.FromMinutes(1), totalMessageCount);
+                rabbitMqMessages.Should().HaveCount(totalMessageCount);
                 exceptions.Should().BeEmpty();
             }
         }
@@ -137,12 +139,12 @@ private static async Task SendMessagesAsync(
             }
         }
 
-        private IRootResolver BuildResolver(Func<IEventFlowOptions, IEventFlowOptions> configure = null)
+        private IRootResolver BuildResolver(Exchange exchange, Func<IEventFlowOptions, IEventFlowOptions> configure = null)
         {
             configure = configure ?? (e => e);
 
             return configure(EventFlowOptions.New
-                .PublishToRabbitMq(RabbitMqConfiguration.With(_uri, false))
+                .PublishToRabbitMq(RabbitMqConfiguration.With(_uri, false, exchange: exchange.Value))
                 .AddDefaults(EventFlowTestHelpers.Assembly))
                 .CreateResolver(false);
         }
diff --git a/Source/EventFlow.RabbitMQ.Tests/RabbitMqConsumer.cs b/Source/EventFlow.RabbitMQ.Tests/RabbitMqConsumer.cs
@@ -41,7 +41,7 @@ public class RabbitMqConsumer : IDisposable
         private readonly EventingBasicConsumer _eventingBasicConsumer;
         private readonly BlockingCollection<BasicDeliverEventArgs> _receivedMessages = new BlockingCollection<BasicDeliverEventArgs>(); 
 
-        public RabbitMqConsumer(Uri uri, string exchange, IEnumerable<string> routingKeys)
+        public RabbitMqConsumer(Uri uri, Exchange exchange, IEnumerable<string> routingKeys)
         {
             var connectionFactory = new ConnectionFactory
                 {
@@ -50,7 +50,7 @@ public RabbitMqConsumer(Uri uri, string exchange, IEnumerable<string> routingKey
             _connection = connectionFactory.CreateConnection();
             _model = _connection.CreateModel();
 
-            _model.ExchangeDeclare(exchange, ExchangeType.Topic, false);
+            _model.ExchangeDeclare(exchange.Value, ExchangeType.Topic, false);
 
             var queueName = $"test-{Guid.NewGuid():N}";
             _model.QueueDeclare(
@@ -64,7 +64,7 @@ public RabbitMqConsumer(Uri uri, string exchange, IEnumerable<string> routingKey
             {
                 _model.QueueBind(
                     queueName,
-                    exchange,
+                    exchange.Value,
                     routingKey,
                     null);
             }

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public class RabbitMqConsumer : IDisposable`
`41`	`41`	`private readonly EventingBasicConsumer _eventingBasicConsumer;`
`42`	`42`	`private readonly BlockingCollection<BasicDeliverEventArgs> _receivedMessages = new BlockingCollection<BasicDeliverEventArgs>();`
`43`	`43`
`44`		`- public RabbitMqConsumer(Uri uri, string exchange, IEnumerable<string> routingKeys)`
	`44`	`+ public RabbitMqConsumer(Uri uri, Exchange exchange, IEnumerable<string> routingKeys)`
`45`	`45`	`{`
`46`	`46`	`var connectionFactory = new ConnectionFactory`
`47`	`47`	`{`
`@@ -50,7 +50,7 @@ public RabbitMqConsumer(Uri uri, string exchange, IEnumerable<string> routingKey`
`50`	`50`	`_connection = connectionFactory.CreateConnection();`
`51`	`51`	`_model = _connection.CreateModel();`
`52`	`52`
`53`		`- _model.ExchangeDeclare(exchange, ExchangeType.Topic, false);`
	`53`	`+ _model.ExchangeDeclare(exchange.Value, ExchangeType.Topic, false);`
`54`	`54`
`55`	`55`	`var queueName = $"test-{Guid.NewGuid():N}";`
`56`	`56`	`_model.QueueDeclare(`
`@@ -64,7 +64,7 @@ public RabbitMqConsumer(Uri uri, string exchange, IEnumerable<string> routingKey`
`64`	`64`	`{`
`65`	`65`	`_model.QueueBind(`
`66`	`66`	`queueName,`
`67`		`- exchange,`
	`67`	`+ exchange.Value,`
`68`	`68`	`routingKey,`
`69`	`69`	`null);`
`70`	`70`	`}`