Update tests

Author: colinangusmackay

src/.idea/.idea.Stravaig.Extensions.Logging.Diagnostics/.idea/projectSettingsUpdater.xml

@@ -21,7 +21,7 @@ public void InformationMessageIsCapturedAndReadable()
             // Arrange
             var logger = new TestCaptureLogger();
             const string message = "This is a test log message.";
-            
+
             // Act
             logger.LogInformation(message);
 
@@ -34,21 +34,21 @@ public void InformationMessageIsCapturedAndReadable()
             entry.LogLevel.ShouldBe(LogLevel.Information);
             entry.FormattedMessage.ShouldContain(message);
         }
-        
+
         [Test]
         public void MultipleLogsAreCapturedAndRetrievedInTheCorrectOrder()
         {
             // Arrange
             var logger = new TestCaptureLogger();
-            
+
             // Act
             logger.LogTrace("This is a trace message.");
             logger.LogDebug("This is a debug message.");
             logger.LogInformation("This is an information message.");
             logger.LogWarning("This is a warning message.");
             logger.LogError("This is an error message.");
             logger.LogCritical("This is a critical message.");
-    
+
             // Assert
             var logEntries = logger.GetLogs();
             logEntries.Count.ShouldBe(6);
@@ -65,9 +65,9 @@ public void NoLoggerCapturedReturnsEmptyList()
         {
             // Arrange
             var logger = new TestCaptureLogger();
-            
+
             // Act - none, no logs are being created.
-            
+
             // Assert
             var logEntries = logger.GetLogs();
             logEntries.Count.ShouldBe(0);
@@ -104,46 +104,53 @@ public void ManyThreadsAccessingLogger()
         {
             const int timeoutMs = 30000;
             const int iterationsPerThread = 25000;
-            int numThreads = Environment.ProcessorCount;
+            int numThreads = Environment.ProcessorCount * 4;
             int expectedLogCount = iterationsPerThread * numThreads;
             Console.WriteLine($"Performing {iterationsPerThread} iterations on each of {numThreads} threads for an expected total of {expectedLogCount} log messages.");
             Task[] tasks = new Task[numThreads];
             var logger = new TestCaptureLogger();
 
             for (int taskNumber = 0; taskNumber < numThreads; taskNumber++)
             {
+                int localTaskNumber = taskNumber;
                 tasks[taskNumber] = Task.Factory.StartNew(() =>
                 {
+                    Console.WriteLine($"Starting task {localTaskNumber} on thread {Environment.CurrentManagedThreadId}");
                     for (int i = 0; i < iterationsPerThread; i++)
                     {
                         logger.LogInformation(
                             "Log iteration {Iteration} on thread {ThreadId}",
                             i,
-                            Thread.CurrentThread.ManagedThreadId);
+                            Environment.CurrentManagedThreadId);
                     }
+                    Console.WriteLine($"Finished task {localTaskNumber} on thread {Environment.CurrentManagedThreadId}");
                 });
             }
 
             using CancellationTokenSource source = new CancellationTokenSource(timeoutMs);
             Task.WaitAll(tasks, source.Token);
-            
+
             tasks.ShouldAllBe(t => t.IsCompleted);
             var logs = logger.GetLogs();
             logs.Count.ShouldBe(expectedLogCount);
-            
+
             // Check no duplicate sequence numbers
             logs.Select(l => l.Sequence).Distinct().Count().ShouldBe(expectedLogCount);
-            
+
             // Checks that log entries are in sequence order
             logs.ShouldBeInOrder(SortDirection.Ascending);
-            
+
             // Check that timestamps progressed forward-only
             Enumerable.Range(0, logs.Count - 2)
                 .Select( i => new
                 {
                     Index = i,
                     Current = logs[i],
-                    Next = logs[i+1]
+                    CurrentSequence = logs[i].Sequence,
+                    CurrentTimestamp = logs[i].TimestampUtc.ToString("O"),
+                    Next = logs[i+1],
+                    NextSequence = logs[i+1].Sequence,
+                    NextTimestamp = logs[i+1].TimestampUtc.ToString("O"),
                 }).ShouldAllBe(e => e.Current.TimestampUtc <= e.Next.TimestampUtc);
 
             DateTime first = logs.First().TimestampUtc;
@@ -152,4 +159,4 @@ public void ManyThreadsAccessingLogger()
             Console.WriteLine($"Logging started at {first:HH:mm:ss.fff} and ended at {last:HH:mm:ss.fff} taking a total of {(last-first):G}");
         }
     }
-}
+}