Code cleanup

ArieGato · Feb 1, 2024 · 6b0a7e2 · 6b0a7e2
1 parent 22fc399
commit 6b0a7e2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 17 deletions.
diff --git a/tests/Serilog.Sinks.RabbitMQ.Tests.Integration/RabbitMQConnectionFactoryTests.cs b/tests/Serilog.Sinks.RabbitMQ.Tests.Integration/RabbitMQConnectionFactoryTests.cs
@@ -14,15 +14,8 @@
 
 namespace Serilog.Sinks.RabbitMQ.Tests.Integration
 {
-    public class RabbitMQConnectionFactoryTests : IClassFixture<RabbitMQFixture>
+    public class RabbitMQConnectionFactoryTests
     {
-        private readonly RabbitMQFixture _fixture;
-
-        public RabbitMQConnectionFactoryTests(RabbitMQFixture fixture)
-        {
-            _fixture = fixture;
-        }
-
         [Fact]
         public void GetConnection_ShouldReturnOpenConnection()
         {
@@ -48,4 +41,4 @@ public void GetConnection_ShouldReturnNull_WhenBrokerCannotBeReached()
             act.Should().ThrowExactly<BrokerUnreachableException>();
         }
     }
-}
+}
diff --git a/tests/Serilog.Sinks.RabbitMQ.Tests.Integration/RabbitMqClientTest.cs b/tests/Serilog.Sinks.RabbitMQ.Tests.Integration/RabbitMqClientTest.cs
@@ -107,7 +107,7 @@ public async Task AutoCreateExchange_WhenTrue_ThenShouldCreateExchange()
 
             var rabbitMQClient = new RabbitMQClient(rabbitMQClientConfiguration);
             rabbitMQClient.Publish("a message");
-            
+
             //// wait for message sent
             //await Task.Delay(1000);
 
@@ -124,7 +124,6 @@ public async Task AutoCreateExchange_WhenTrue_ThenShouldCreateExchange()
             }
         }
 
-#if NET8_0_OR_GREATER
         /// <summary>
         /// Consumer should receive a message after calling Publish.
         /// </summary>
@@ -137,9 +136,9 @@ public async Task Publish_ParallelMessages_AllMessagesArePublished()
             var watch = System.Diagnostics.Stopwatch.StartNew();
             var message = Guid.NewGuid().ToString();
 
-            var parallelOptions = new ParallelOptions(){ MaxDegreeOfParallelism = 10 };
+            var parallelOptions = new ParallelOptions { MaxDegreeOfParallelism = 10 };
 
-            await Parallel.ForAsync(0, 10, parallelOptions, async (_, _) =>
+            Parallel.For(0, 10, parallelOptions, (_, _) =>
             {
                 for (var i = 0; i < 1000; i++)
                 {
@@ -149,6 +148,5 @@ await Parallel.ForAsync(0, 10, parallelOptions, async (_, _) =>
 
             watch.Stop();
         }
-#endif
     }
 }
diff --git a/tests/Serilog.Sinks.RabbitMQ.Tests/RabbitMQ/RabbitMQClientTests.cs b/tests/Serilog.Sinks.RabbitMQ.Tests/RabbitMQ/RabbitMQClientTests.cs
@@ -20,7 +20,7 @@ namespace Serilog.Sinks.RabbitMQ.Tests.RabbitMQ
     public class RabbitMQClientTests
     {
         [Fact]
-        public async Task PublishAsync_ShouldCreateAndReturnChannelToPool()
+        public void Publish_ShouldCreateAndReturnChannelToPool()
         {
             // Arrange
             var rabbitMQClientConfiguration = new RabbitMQClientConfiguration()
@@ -81,7 +81,7 @@ public void Close_ShouldThrowAggregateException_WhenExceptionsOccur()
                 RouteKey = "some-route-key"
             };
             var rabbitMQConnectionFactory = Substitute.For<IRabbitMQConnectionFactory>();
-            rabbitMQConnectionFactory.When(x => x.Close()).Do(x => throw new InvalidOperationException("some-exception"));
+            rabbitMQConnectionFactory.When(x => x.Close()).Do(_ => throw new InvalidOperationException("some-exception"));
 
             var rabbitMQChannelObjectPoolPolicy = Substitute.For<IPooledObjectPolicy<IRabbitMQChannel>>();
 
@@ -100,7 +100,7 @@ public void Close_ShouldThrowAggregateException_WhenExceptionsOccur()
         }
 
         [Fact]
-        public async Task Dispose_ShouldDisposeConnectionAndChannel()
+        public void Dispose_ShouldDisposeConnectionAndChannel()
         {
             // Arrange
             var rabbitMQClientConfiguration = new RabbitMQClientConfiguration()