Tidying tests

justeattakeaway · May 15, 2023 · c82c795 · c82c795
1 parent ec5c6e7
commit c82c795
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/tests/JustSaying.UnitTests/JustSayingBus/GivenAServiceBus.cs b/tests/JustSaying.UnitTests/JustSayingBus/GivenAServiceBus.cs
@@ -10,7 +10,6 @@ namespace JustSaying.UnitTests.JustSayingBus;
 public abstract class GivenAServiceBus : IAsyncLifetime
 {
     protected IMessagingConfig Config;
-    protected IMessageReceivePauseSignal MessageReceivePauseSignal;
     protected TrackingLoggingMonitor Monitor;
     protected ILoggerFactory LoggerFactory;
     private bool _recordThrownExceptions;
@@ -52,7 +51,6 @@ public virtual Task DisposeAsync()
     protected virtual void Given()
     {
         Config = Substitute.For<IMessagingConfig>();
-        MessageReceivePauseSignal = Substitute.For<IMessageReceivePauseSignal>();
         Monitor = new TrackingLoggingMonitor(LoggerFactory.CreateLogger<TrackingLoggingMonitor>());
     }
 
@@ -61,9 +59,10 @@ protected virtual void Given()
     private JustSaying.JustSayingBus CreateSystemUnderTest()
     {
         var serializerRegister = new FakeSerializationRegister();
+        var messageReceivePauseSignal = new MessageReceivePauseSignal();
         var bus = new JustSaying.JustSayingBus(Config,
             serializerRegister,
-            MessageReceivePauseSignal,
+            messageReceivePauseSignal,
             LoggerFactory,
             Monitor);
 

diff --git a/tests/JustSaying.UnitTests/JustSayingBus/GivenAServiceBusWithoutMonitoring.cs b/tests/JustSaying.UnitTests/JustSayingBus/GivenAServiceBusWithoutMonitoring.cs
@@ -7,7 +7,6 @@ namespace JustSaying.UnitTests.JustSayingBus;
 public abstract class GivenAServiceBusWithoutMonitoring : IAsyncLifetime
 {
     protected IMessagingConfig Config;
-    protected IMessageReceivePauseSignal MessageReceivePauseSignal;
     protected ILoggerFactory LoggerFactory;
 
     protected JustSaying.JustSayingBus SystemUnderTest { get; private set; }
@@ -29,14 +28,13 @@ public virtual Task DisposeAsync()
     protected virtual void Given()
     {
         Config = Substitute.For<IMessagingConfig>();
-        MessageReceivePauseSignal = Substitute.For<IMessageReceivePauseSignal>();
         LoggerFactory = Substitute.For<ILoggerFactory>();
     }
 
     protected abstract Task WhenAsync();
 
     private JustSaying.JustSayingBus CreateSystemUnderTest()
     {
-        return new JustSaying.JustSayingBus(Config, null, MessageReceivePauseSignal, LoggerFactory, null);
+        return new JustSaying.JustSayingBus(Config, null, new MessageReceivePauseSignal(), LoggerFactory, null);
     }
 }
diff --git a/...tSaying.UnitTests/Messaging/Channels/MessageReceiveBufferTests/WhenReceivingShouldStop.cs b/...tSaying.UnitTests/Messaging/Channels/MessageReceiveBufferTests/WhenReceivingShouldStop.cs
@@ -89,11 +89,10 @@ public async Task No_Messages_Are_Processed()
 
         // Make sure that number makes sense
         messagesRead.ShouldBe(0);
-        messagesRead.ShouldBeLessThanOrEqualTo(_callCount);
     }
 
     [Fact]
-    public async Task All_Message_Are_Processed_After_Starting()
+    public async Task All_Messages_Are_Processed_After_Starting()
     {
         // Signal stop receiving messages
         _messageReceivePauseSignal.Pause();