Remove ILoggerFactory in constructor.

jjrdk · Apr 25, 2021 · 948a5f7 · 948a5f7
1 parent 7d48a78
commit 948a5f7
Show file tree

Hide file tree

Showing 18 changed files with 148 additions and 142 deletions.
diff --git a/src/DiskQueue.Reactive/PersistentBuffer.cs b/src/DiskQueue.Reactive/PersistentBuffer.cs
@@ -11,7 +11,7 @@ public class PersistentBuffer : IObservable<byte[]>, IObserver<byte[]>, IAsyncDi
         private readonly IPersistentQueue queue;
         private readonly int retryCount;
         private CancellationTokenSource tokenSource;
-        private readonly List<IObserver<byte[]>> subscribers = new List<IObserver<byte[]>>();
+        private readonly List<IObserver<byte[]>> subscribers = new();
         private Task work;
 
         public PersistentBuffer(IPersistentQueue queue, int retryCount)

diff --git a/src/DiskQueue.Reactive/TypedPersistentBuffer.cs b/src/DiskQueue.Reactive/TypedPersistentBuffer.cs
@@ -9,7 +9,7 @@ public class TypedPersistentBuffer<T> : IObserver<T>, IObservable<T>, IAsyncDisp
         private readonly PersistentBuffer innerBuffer;
         private readonly Func<T, byte[]> serializer;
         private readonly Func<byte[], T> deserializer;
-        private readonly List<IObserver<byte[]>> observers = new List<IObserver<byte[]>>();
+        private readonly List<IObserver<byte[]>> observers = new();
 
         public TypedPersistentBuffer(PersistentBuffer innerBuffer, Func<T, byte[]> serializer, Func<byte[], T> deserializer)
         {

diff --git a/src/DiskQueue.Tests/CountOfItemsPersistentQueueTests.cs b/src/DiskQueue.Tests/CountOfItemsPersistentQueueTests.cs
@@ -12,15 +12,15 @@ public class CountOfItemsPersistentQueueTests : PersistentQueueTestsBase
         public async Task Can_get_count_from_queue()
         {
             await using var queue =
-                await PersistentQueue.Create(Path, Substitute.For<ILoggerFactory>()).ConfigureAwait(false);
+                await PersistentQueue.Create(Path, Substitute.For<ILogger<IPersistentQueue>>()).ConfigureAwait(false);
             Assert.Equal(0, ((IPersistentQueueStore) queue).EstimatedCountOfItemsInQueue);
         }
 
         [Fact]
         public async Task Can_enter_items_and_get_count_of_items()
         {
             await using var queue =
-                await PersistentQueue.Create(Path, Substitute.For<ILoggerFactory>()).ConfigureAwait(false);
+                await PersistentQueue.Create(Path, Substitute.For<ILogger<IPersistentQueue>>()).ConfigureAwait(false);
             for (byte i = 0; i < 5; i++)
             {
                 using var session = queue.OpenSession();
@@ -36,7 +36,7 @@ public async Task Can_enter_items_and_get_count_of_items()
         public async Task Can_get_count_of_items_after_queue_restart()
         {
             await using (var queue =
-                await PersistentQueue.Create(Path, Substitute.For<ILoggerFactory>()).ConfigureAwait(false))
+                await PersistentQueue.Create(Path, Substitute.For<ILogger<IPersistentQueue>>()).ConfigureAwait(false))
             {
                 for (byte i = 0; i < 5; i++)
                 {
@@ -47,7 +47,7 @@ await PersistentQueue.Create(Path, Substitute.For<ILoggerFactory>()).ConfigureAw
             }
 
             await using (var queue =
-                await PersistentQueue.Create(Path, Substitute.For<ILoggerFactory>()).ConfigureAwait(false))
+                await PersistentQueue.Create(Path, Substitute.For<ILogger<IPersistentQueue>>()).ConfigureAwait(false))
             {
                 Assert.Equal(5, ((IPersistentQueueStore) queue).EstimatedCountOfItemsInQueue);
             }

diff --git a/src/DiskQueue.Tests/EncryptedPersistentQueueTests.cs b/src/DiskQueue.Tests/EncryptedPersistentQueueTests.cs
@@ -17,7 +17,7 @@ public async Task CanReadBackFromEncryptedQueue()
             using var algo = CreateAlgo();
             await using var queue = await PersistentQueue.Create(
                     Path,
-                    Substitute.For<ILoggerFactory>(),
+                    Substitute.For<ILogger<IPersistentQueue>>(),
                     paranoidFlushing: false,
                     symmetricAlgorithm: algo)
                 .ConfigureAwait(false);
@@ -47,7 +47,7 @@ public async Task Dequeing_from_empty_queue_will_return_null()
         {
             using var algo = CreateAlgo();
             await using var queue = await PersistentQueue
-                .Create(Path, Substitute.For<ILoggerFactory>(), symmetricAlgorithm: algo)
+                .Create(Path, Substitute.For<ILogger<IPersistentQueue>>(), symmetricAlgorithm: algo)
                 .ConfigureAwait(false);
             using var session = queue.OpenSession();
             Assert.Null(await session.Dequeue().ConfigureAwait(false));
@@ -58,20 +58,20 @@ public async Task Can_enqueue_and_dequeue_data_after_restarting_queue()
         {
             using var algo = CreateAlgo();
             await using (var queue = await PersistentQueue
-                .Create(Path, Substitute.For<ILoggerFactory>(), symmetricAlgorithm: algo)
+                .Create(Path, Substitute.For<ILogger<IPersistentQueue>>(), symmetricAlgorithm: algo)
                 .ConfigureAwait(false))
             using (var session = queue.OpenSession())
             {
-                await session.Enqueue(new byte[] {1, 2, 3, 4}).ConfigureAwait(false);
+                await session.Enqueue(new byte[] { 1, 2, 3, 4 }).ConfigureAwait(false);
                 await session.Flush().ConfigureAwait(false);
             }
 
             await using (var queue = await PersistentQueue
-                .Create(Path, Substitute.For<ILoggerFactory>(), symmetricAlgorithm: algo)
+                .Create(Path, Substitute.For<ILogger<IPersistentQueue>>(), symmetricAlgorithm: algo)
                 .ConfigureAwait(false))
             using (var session = queue.OpenSession())
             {
-                Assert.Equal<byte>(new byte[] {1, 2, 3, 4}, await session.Dequeue().ConfigureAwait(false));
+                Assert.Equal<byte>(new byte[] { 1, 2, 3, 4 }, await session.Dequeue().ConfigureAwait(false));
                 await session.Flush().ConfigureAwait(false);
             }
         }

diff --git a/src/DiskQueue.Tests/LongTermDequeueTests.cs b/src/DiskQueue.Tests/LongTermDequeueTests.cs
@@ -16,7 +16,7 @@ public class LongTermDequeueTests : IDisposable
         public LongTermDequeueTests()
         {
             _source = new CancellationTokenSource(TimeSpan.FromSeconds(10));
-            _q = PersistentQueue.Create("./queue", Substitute.For<ILoggerFactory>(), cancellationToken: _source.Token)
+            _q = PersistentQueue.Create("./queue", Substitute.For<ILogger<IPersistentQueue>>(), cancellationToken: _source.Token)
                 .GetAwaiter()
                 .GetResult();
         }

diff --git a/src/DiskQueue.Tests/MultiFileQueueTests.cs b/src/DiskQueue.Tests/MultiFileQueueTests.cs
@@ -13,7 +13,7 @@ public class MultiFileQueueTests : PersistentQueueTestsBase
         public async Task Entering_more_than_count_of_items_will_work()
         {
             await using var queue = await PersistentQueue
-                .Create(Path, Substitute.For<ILoggerFactory>(), maxFileSize: 10)
+                .Create(Path, Substitute.For<ILogger<IPersistentQueue>>(), maxFileSize: 10)
                 .ConfigureAwait(false);
             for (byte i = 0; i < 11; i++)
             {
@@ -29,7 +29,7 @@ public async Task Entering_more_than_count_of_items_will_work()
         public async Task When_creating_more_items_than_allowed_in_first_file_will_create_additional_file()
         {
             await using var queue = await PersistentQueue
-                .Create(Path, Substitute.For<ILoggerFactory>(), maxFileSize: 10)
+                .Create(Path, Substitute.For<ILogger<IPersistentQueue>>(), maxFileSize: 10)
                 .ConfigureAwait(false);
             for (byte i = 0; i < 11; i++)
             {
@@ -45,7 +45,7 @@ public async Task When_creating_more_items_than_allowed_in_first_file_will_creat
         public async Task Can_resume_writing_to_second_file_when_restart_queue()
         {
             await using (var queue = await PersistentQueue
-                .Create(Path, Substitute.For<ILoggerFactory>(), maxFileSize: 10)
+                .Create(Path, Substitute.For<ILogger<IPersistentQueue>>(), maxFileSize: 10)
                 .ConfigureAwait(false))
             {
                 for (byte i = 0; i < 11; i++)
@@ -59,7 +59,7 @@ public async Task Can_resume_writing_to_second_file_when_restart_queue()
             }
 
             await using (var queue = await PersistentQueue
-                .Create(Path, Substitute.For<ILoggerFactory>(), maxFileSize: 10)
+                .Create(Path, Substitute.For<ILogger<IPersistentQueue>>(), maxFileSize: 10)
                 .ConfigureAwait(false))
             {
                 for (byte i = 0; i < 2; i++)
@@ -77,7 +77,7 @@ public async Task Can_resume_writing_to_second_file_when_restart_queue()
         public async Task Can_dequeue_from_all_files()
         {
             await using (var queue = await PersistentQueue
-                .Create(Path, Substitute.For<ILoggerFactory>(), maxFileSize: 10)
+                .Create(Path, Substitute.For<ILogger<IPersistentQueue>>(), maxFileSize: 10)
                 .ConfigureAwait(false))
             {
                 for (byte i = 0; i < 12; i++)
@@ -91,7 +91,7 @@ public async Task Can_dequeue_from_all_files()
             }
 
             await using (var queue = await PersistentQueue
-                .Create(Path, Substitute.For<ILoggerFactory>(), maxFileSize: 10)
+                .Create(Path, Substitute.For<ILogger<IPersistentQueue>>(), maxFileSize: 10)
                 .ConfigureAwait(false))
             {
                 for (byte i = 0; i < 12; i++)
@@ -107,7 +107,7 @@ public async Task Can_dequeue_from_all_files()
         public async Task Can_dequeue_from_all_files_after_restart()
         {
             await using (var queue = await PersistentQueue
-                .Create(Path, Substitute.For<ILoggerFactory>(), maxFileSize: 10)
+                .Create(Path, Substitute.For<ILogger<IPersistentQueue>>(), maxFileSize: 10)
                 .ConfigureAwait(false))
             {
                 for (byte i = 0; i < 12; i++)
@@ -121,7 +121,7 @@ public async Task Can_dequeue_from_all_files_after_restart()
             }
 
             await using (var queue = await PersistentQueue
-                .Create(Path, Substitute.For<ILoggerFactory>(), maxFileSize: 10)
+                .Create(Path, Substitute.For<ILogger<IPersistentQueue>>(), maxFileSize: 10)
                 .ConfigureAwait(false))
             {
                 for (byte i = 0; i < 3; i++)
@@ -136,7 +136,7 @@ public async Task Can_dequeue_from_all_files_after_restart()
 
 
             await using (var queue = await PersistentQueue
-                .Create(Path, Substitute.For<ILoggerFactory>(), maxFileSize: 10)
+                .Create(Path, Substitute.For<ILogger<IPersistentQueue>>(), maxFileSize: 10)
                 .ConfigureAwait(false))
             {
                 using var session = queue.OpenSession();
@@ -158,7 +158,7 @@ public async Task Can_dequeue_from_all_files_after_restart()
         public async Task After_reading_all_items_from_file_that_is_not_the_active_file_should_delete_file()
         {
             await using (var queue = await PersistentQueue
-                .Create(Path, Substitute.For<ILoggerFactory>(), maxFileSize: 10)
+                .Create(Path, Substitute.For<ILogger<IPersistentQueue>>(), maxFileSize: 10)
                 .ConfigureAwait(false))
             {
                 for (byte i = 0; i < 12; i++)
@@ -172,7 +172,7 @@ public async Task After_reading_all_items_from_file_that_is_not_the_active_file_
             }
 
             await using (var queue = await PersistentQueue
-                .Create(Path, Substitute.For<ILoggerFactory>(), maxFileSize: 10)
+                .Create(Path, Substitute.For<ILogger<IPersistentQueue>>(), maxFileSize: 10)
                 .ConfigureAwait(false))
             {
                 for (byte i = 0; i < 12; i++)

diff --git a/src/DiskQueue.Tests/MultipleProcessAccessTests.cs b/src/DiskQueue.Tests/MultipleProcessAccessTests.cs
@@ -60,7 +60,7 @@ static async Task AddToQueue(byte[] data)
             await Task.Delay(150).ConfigureAwait(false);
             await using var queue = await PersistentQueue.Create(
                     SharedStorage,
-                    Substitute.For<ILoggerFactory>(),
+                    Substitute.For<ILogger<IPersistentQueue>>(),
                     TimeSpan.FromSeconds(30))
                 .ConfigureAwait(false);
             using var session = queue.OpenSession();
@@ -73,7 +73,7 @@ static async Task<byte[]> ReadQueue()
             await Task.Delay(150).ConfigureAwait(false);
             await using var queue = await PersistentQueue.Create(
                     SharedStorage,
-                    Substitute.For<ILoggerFactory>(),
+                    Substitute.For<ILogger<IPersistentQueue>>(),
                     TimeSpan.FromSeconds(30))
                 .ConfigureAwait(false);
             using var session = queue.OpenSession();

diff --git a/src/DiskQueue.Tests/ParanoidFlushingTests.cs b/src/DiskQueue.Tests/ParanoidFlushingTests.cs
@@ -15,7 +15,7 @@ public class ParanoidFlushingTests
         public async Task Paranoid_flushing_still_respects_session_rollback()
         {
             await using var queue = await PersistentQueue
-                .Create("./queue", Substitute.For<ILoggerFactory>(), paranoidFlushing: true)
+                .Create("./queue", Substitute.For<ILogger<IPersistentQueue>>(), paranoidFlushing: true)
                 .ConfigureAwait(false);
 
             // Flush only `_one`

diff --git a/src/DiskQueue.Tests/PerformanceTests.cs b/src/DiskQueue.Tests/PerformanceTests.cs
@@ -17,7 +17,7 @@ public class PerformanceTests : PersistentQueueTestsBase
         public async Task Enqueue_million_items_with_100_flushes()
         {
             await using var queue = await PersistentQueue
-                .Create(Path, Substitute.For<ILoggerFactory>(), paranoidFlushing: false)
+                .Create(Path, Substitute.For<ILogger<IPersistentQueue>>(), paranoidFlushing: false)
                 .ConfigureAwait(false);
             for (var i = 0; i < 100; i++)
             {
@@ -35,7 +35,7 @@ public async Task Enqueue_million_items_with_100_flushes()
         public async Task Enqueue_million_items_with_single_flush()
         {
             await using var queue = await PersistentQueue
-                .Create(Path, Substitute.For<ILoggerFactory>(), paranoidFlushing: false)
+                .Create(Path, Substitute.For<ILogger<IPersistentQueue>>(), paranoidFlushing: false)
                 .ConfigureAwait(false);
             using var session = queue.OpenSession();
             for (var i = 0; i < LargeCount; i++)
@@ -50,7 +50,7 @@ public async Task Enqueue_million_items_with_single_flush()
         public async Task Enqueue_and_dequeue_million_items_same_queue()
         {
             await using var queue = await PersistentQueue
-                .Create(Path, Substitute.For<ILoggerFactory>(), paranoidFlushing: false)
+                .Create(Path, Substitute.For<ILogger<IPersistentQueue>>(), paranoidFlushing: false)
                 .ConfigureAwait(false);
             using (var session = queue.OpenSession())
             {
@@ -77,7 +77,7 @@ public async Task Enqueue_and_dequeue_million_items_same_queue()
         public async Task Enqueue_and_dequeue_million_items_restart_queue()
         {
             await using (var queue =
-                await PersistentQueue.Create(Path, Substitute.For<ILoggerFactory>()).ConfigureAwait(false))
+                await PersistentQueue.Create(Path, Substitute.For<ILogger<IPersistentQueue>>()).ConfigureAwait(false))
             {
                 using var session = queue.OpenSession();
                 for (var i = 0; i < LargeCount; i++)
@@ -89,7 +89,7 @@ await PersistentQueue.Create(Path, Substitute.For<ILoggerFactory>()).ConfigureAw
             }
 
             await using (var queue =
-                await PersistentQueue.Create(Path, Substitute.For<ILoggerFactory>()).ConfigureAwait(false))
+                await PersistentQueue.Create(Path, Substitute.For<ILogger<IPersistentQueue>>()).ConfigureAwait(false))
             {
                 using var session = queue.OpenSession();
                 for (var i = 0; i < LargeCount; i++)
@@ -107,7 +107,7 @@ public async Task Enqueue_and_dequeue_large_items_with_restart_queue()
             var random = new Random();
             var itemsSizes = new List<int>();
             await using (var queue =
-                await PersistentQueue.Create(Path, Substitute.For<ILoggerFactory>()).ConfigureAwait(false))
+                await PersistentQueue.Create(Path, Substitute.For<ILogger<IPersistentQueue>>()).ConfigureAwait(false))
             {
                 using var session = queue.OpenSession();
                 for (var i = 0; i < SmallCount; i++)
@@ -121,7 +121,7 @@ await PersistentQueue.Create(Path, Substitute.For<ILoggerFactory>()).ConfigureAw
             }
 
             await using (var queue =
-                await PersistentQueue.Create(Path, Substitute.For<ILoggerFactory>()).ConfigureAwait(false))
+                await PersistentQueue.Create(Path, Substitute.For<ILogger<IPersistentQueue>>()).ConfigureAwait(false))
             {
                 using var session = queue.OpenSession();
                 for (var i = 0; i < SmallCount; i++)

diff --git a/src/DiskQueue.Tests/PersistentQueueSessionTests.cs b/src/DiskQueue.Tests/PersistentQueueSessionTests.cs
@@ -60,7 +60,7 @@ public async Task Errors_raised_during_flush_write_will_be_thrown_as_is()
         [Fact]
         public async Task If_data_stream_is_truncated_will_raise_error()
         {
-            await using (var queue = await PersistentQueue.Create(Path, Substitute.For<ILoggerFactory>()).ConfigureAwait(false))
+            await using (var queue = await PersistentQueue.Create(Path, Substitute.For<ILogger<IPersistentQueue>>()).ConfigureAwait(false))
             using (var session = queue.OpenSession())
             {
                 await session.Enqueue(new byte[] { 1, 2, 3, 4 }).ConfigureAwait(false);
@@ -75,7 +75,7 @@ public async Task If_data_stream_is_truncated_will_raise_error()
             var invalidOperationException = await Assert.ThrowsAsync<InvalidOperationException>(
              async () =>
                 {
-                    await using var queue = await PersistentQueue.Create(Path, Substitute.For<ILoggerFactory>()).ConfigureAwait(false);
+                    await using var queue = await PersistentQueue.Create(Path, Substitute.For<ILogger<IPersistentQueue>>()).ConfigureAwait(false);
                     using var session = queue.OpenSession();
                     await session.Dequeue().ConfigureAwait(false);
                 }).ConfigureAwait(false);