Change to culture formatted date to match test explorer.

tonyhallett · tonyhallett · commit 6e31a218445c · 2025-03-02T10:01:39.000Z
TestContainerDiscover logs coverage starting with run count.
Move Logger/ILogger inside a namespace
diff --git a/FineCodeCoverageTests/FCCEngine_Tests.cs b/FineCodeCoverageTests/FCCEngine_Tests.cs
@@ -11,6 +11,7 @@
 using FineCodeCoverage.Engine.Model;
 using FineCodeCoverage.Engine.MsTestPlatform;
 using FineCodeCoverage.Engine.ReportGenerator;
+using FineCodeCoverage.Impl;
 using FineCodeCoverage.Options;
 using FineCodeCoverage.Output;
 using Moq;
@@ -105,13 +106,6 @@ public void SetUp()
             mockAppOptionsProvider.Setup(x => x.Get()).Returns(mockedAppOptions.Object);
         }
 
-        [Test]
-        public async Task Should_Log_Starting_When_Initialized_Async()
-        {
-            await ReloadInitializedCoverage_Async();
-            VerifyLogsReloadCoverageStatus(ReloadCoverageStatus.Start);
-        }
-
         [Test]
         public async Task Should_Prepare_For_Coverage_Suitable_CoverageProjects_Async()
         {
@@ -319,7 +313,7 @@ public async Task Should_Cancel_Existing_ReloadCoverage_When_ReloadCoverage_Asyn
 
         private void VerifyLogsReloadCoverageStatus(ReloadCoverageStatus reloadCoverageStatus)
         {
-            mocker.Verify<ILogger>(l => l.Log(fccEngine.GetLogReloadCoverageStatusMessage(reloadCoverageStatus)));
+            mocker.Verify<ILogger>(l => l.Log(StatusMarkerProvider.Get(reloadCoverageStatus.ToString())));
         }
 
         private async Task StopCoverage_Async()
diff --git a/FineCodeCoverageTests/TestContainerDiscovery_Tests.cs b/FineCodeCoverageTests/TestContainerDiscovery_Tests.cs
@@ -10,11 +10,10 @@
 using FineCodeCoverage.Engine.MsTestPlatform.CodeCoverage;
 using FineCodeCoverage.Impl;
 using FineCodeCoverage.Options;
-using Microsoft.Build.Evaluation;
 using Microsoft.VisualStudio.TestWindow.Extensibility;
 using Moq;
 using NUnit.Framework;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement;
+using FineCodeCoverage.Output;
 
 namespace Test
 {
@@ -60,7 +59,7 @@ public void Should_Return_True_For_All_Other_States_If_Was_Initialized_When_Test
         public void Should_Log_When_Cannot_Invoke(TestOperationStates testOperationState)
         {
             testOperationStateInvocationManager.CanInvoke(testOperationState);
-            mocker.Verify<ILogger>(logger => logger.Log($"Skipping {testOperationState} as FCC not initialized"));
+            mocker.Verify<FineCodeCoverage.Output.ILogger>(logger => logger.Log($"Skipping {testOperationState} as FCC not initialized"));
         }
        
     }
@@ -379,7 +378,7 @@ public void Should_Handle_Any_Exception_In_OperationState_Changed_Handler_Loggin
             var exception = new Exception();
             mocker.GetMock<IFCCEngine>().Setup(engine => engine.StopCoverage()).Throws(exception);
             RaiseTestExecutionCancelling();
-            mocker.Verify<ILogger>(logger => logger.Log("Error processing unit test events", exception));
+            mocker.Verify<FineCodeCoverage.Output.ILogger>(logger => logger.Log("Error processing unit test events", exception));
         }
 
         [TestCase(true)]
diff --git a/SharedProject/Core/AppDataFolder.cs b/SharedProject/Core/AppDataFolder.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Threading;
 using FineCodeCoverage.Options;
+using FineCodeCoverage.Output;
 
 namespace FineCodeCoverage.Engine
 {
diff --git a/SharedProject/Core/CoverageToolOutput/CoverageToolOutputManager.cs b/SharedProject/Core/CoverageToolOutput/CoverageToolOutputManager.cs
@@ -5,6 +5,7 @@
 using System.Linq;
 using FineCodeCoverage.Core.Utilities;
 using FineCodeCoverage.Engine.Model;
+using FineCodeCoverage.Output;
 using SharedProject.Core.CoverageToolOutput;
 
 namespace FineCodeCoverage.Engine
diff --git a/SharedProject/Core/Coverlet/Console/CoverletConsoleDotnetToolsGlobalExecutor.cs b/SharedProject/Core/Coverlet/Console/CoverletConsoleDotnetToolsGlobalExecutor.cs
@@ -1,6 +1,7 @@
 ﻿using System.ComponentModel.Composition;
 using FineCodeCoverage.Core.Utilities;
 using FineCodeCoverage.Engine.Model;
+using FineCodeCoverage.Output;
 
 namespace FineCodeCoverage.Engine.Coverlet
 {
diff --git a/SharedProject/Core/Coverlet/Console/CoverletConsoleDotnetToolsLocalExecutor.cs b/SharedProject/Core/Coverlet/Console/CoverletConsoleDotnetToolsLocalExecutor.cs
@@ -1,6 +1,7 @@
 ﻿using System.ComponentModel.Composition;
 using FineCodeCoverage.Core.Utilities;
 using FineCodeCoverage.Engine.Model;
+using FineCodeCoverage.Output;
 
 namespace FineCodeCoverage.Engine.Coverlet
 {
diff --git a/SharedProject/Core/Coverlet/Console/CoverletConsoleUtil.cs b/SharedProject/Core/Coverlet/Console/CoverletConsoleUtil.cs
@@ -6,6 +6,7 @@
 using System.Threading.Tasks;
 using FineCodeCoverage.Core.Utilities;
 using FineCodeCoverage.Engine.Model;
+using FineCodeCoverage.Output;
 
 namespace FineCodeCoverage.Engine.Coverlet
 {
diff --git a/SharedProject/Core/Coverlet/Console/DotNetToolListCoverlet.cs b/SharedProject/Core/Coverlet/Console/DotNetToolListCoverlet.cs
@@ -3,6 +3,7 @@
 using System.ComponentModel.Composition;
 using System.Linq;
 using FineCodeCoverage.Core.Utilities;
+using FineCodeCoverage.Output;
 
 namespace FineCodeCoverage.Engine.Coverlet
 {
diff --git a/SharedProject/Core/Coverlet/DataCollector/CoverletDataCollectorUtil.cs b/SharedProject/Core/Coverlet/DataCollector/CoverletDataCollectorUtil.cs
@@ -10,6 +10,7 @@
 using FineCodeCoverage.Core.Utilities;
 using FineCodeCoverage.Core.Utilities.VsThreading;
 using FineCodeCoverage.Engine.Model;
+using FineCodeCoverage.Output;
 using Microsoft.VisualStudio.Shell;
 using Task = System.Threading.Tasks.Task;
 
diff --git a/SharedProject/Core/Coverlet/DataCollector/DataCollectorSettingsBuilder.cs b/SharedProject/Core/Coverlet/DataCollector/DataCollectorSettingsBuilder.cs
@@ -1,10 +1,9 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
-using System.IO;
 using System.Linq;
 using System.Xml.Linq;
-using FineCodeCoverage.Options;
+using FineCodeCoverage.Output;
 
 namespace FineCodeCoverage.Engine.Coverlet
 {
diff --git a/SharedProject/Core/Coverlet/DataCollector/DataCollectorSettingsBuilderFactory.cs b/SharedProject/Core/Coverlet/DataCollector/DataCollectorSettingsBuilderFactory.cs
@@ -1,5 +1,6 @@
 ﻿using System.ComponentModel.Composition;
 using FineCodeCoverage.Options;
+using FineCodeCoverage.Output;
 
 namespace FineCodeCoverage.Engine.Coverlet
 {
diff --git a/SharedProject/Core/FCCEngine.cs b/SharedProject/Core/FCCEngine.cs
@@ -9,6 +9,7 @@
 using FineCodeCoverage.Engine.MsTestPlatform;
 using FineCodeCoverage.Engine.MsTestPlatform.CodeCoverage;
 using FineCodeCoverage.Engine.ReportGenerator;
+using FineCodeCoverage.Impl;
 using FineCodeCoverage.Options;
 using FineCodeCoverage.Output;
 
@@ -105,13 +106,10 @@ IDisposeAwareTaskRunner disposeAwareTaskRunner
             this.msCodeCoverageRunSettingsService = msCodeCoverageRunSettingsService;
         }
 
-        internal string GetLogReloadCoverageStatusMessage(ReloadCoverageStatus reloadCoverageStatus)
-        {
-            return $"================================== {reloadCoverageStatus.ToString().ToUpper()} ==================================";
-        }
+
         private void LogReloadCoverageStatus(ReloadCoverageStatus reloadCoverageStatus)
         {
-            logger.Log(GetLogReloadCoverageStatusMessage(reloadCoverageStatus));
+            logger.Log(StatusMarkerProvider.Get(reloadCoverageStatus.ToString()));
         }
 
         public void Initialize(CancellationToken cancellationToken)
@@ -292,7 +290,7 @@ private void CoverageTaskCompletion(System.Threading.Tasks.Task<ReportResult> t,
                     case System.Threading.Tasks.TaskStatus.Faulted:
                         var innerException = t.Exception.InnerExceptions[0];
                         logger.Log(
-                            GetLogReloadCoverageStatusMessage(ReloadCoverageStatus.Error),
+                            StatusMarkerProvider.Get(ReloadCoverageStatus.Error.ToString()),
                             innerException
                         );
                         reportGeneratorUtil.LogCoverageProcess("An exception occurred. See the FCC Output Pane");
@@ -360,9 +358,6 @@ public void ReloadCoverage(Func<System.Threading.Tasks.Task<List<ICoverageProjec
             {
                 ReportResult reportResult = new ReportResult();
 
-                reportGeneratorUtil.LogCoverageProcess("Starting coverage - full details in FCC Output Pane");
-                LogReloadCoverageStatus(ReloadCoverageStatus.Start);
-
                 var coverageProjects = await coverageRequestCallback();
                 vsShutdownLinkedCancellationToken.ThrowIfCancellationRequested();
 
diff --git a/SharedProject/Core/Initialization/Initializer.cs b/SharedProject/Core/Initialization/Initializer.cs
@@ -3,6 +3,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using FineCodeCoverage.Engine;
+using FineCodeCoverage.Output;
 
 namespace FineCodeCoverage.Core.Initialization
 {
diff --git a/SharedProject/Core/Model/ReferencedProjects/ProjectFileReferencedProjectsHelper.cs b/SharedProject/Core/Model/ReferencedProjects/ProjectFileReferencedProjectsHelper.cs
@@ -1,4 +1,5 @@
-﻿using System.Collections.Generic;
+﻿using FineCodeCoverage.Output;
+using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.IO;
 using System.Linq;
diff --git a/SharedProject/Core/Model/SettingsMerger.cs b/SharedProject/Core/Model/SettingsMerger.cs
@@ -1,5 +1,6 @@
 ﻿using FineCodeCoverage.Core.Utilities;
 using FineCodeCoverage.Options;
+using FineCodeCoverage.Output;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
diff --git a/SharedProject/Core/MsTestPlatform/CodeCoverage/MsCodeCoverageRunSettingsService.cs b/SharedProject/Core/MsTestPlatform/CodeCoverage/MsCodeCoverageRunSettingsService.cs
@@ -61,7 +61,7 @@ public static async Task<CoverageProjectsByType> CreateAsync(ITestOperation test
         private readonly IAppOptionsProvider appOptionsProvider;
         private readonly ICoverageToolOutputManager coverageOutputManager;
         private readonly IShimCopier shimCopier;
-        private readonly ILogger logger;
+        private readonly Output.ILogger logger;
         private readonly IReportGeneratorUtil reportGeneratorUtil;
         private IFCCEngine fccEngine;
 
@@ -94,7 +94,7 @@ public MsCodeCoverageRunSettingsService(
             IUserRunSettingsService userRunSettingsService,
             ITemplatedRunSettingsService templatedRunSettingsService,
             IShimCopier shimCopier,
-            ILogger logger,
+            Output.ILogger logger,
             IReportGeneratorUtil reportGeneratorUtil
             )
         {
diff --git a/SharedProject/Core/OpenCover/OpenCoverUtil.cs b/SharedProject/Core/OpenCover/OpenCoverUtil.cs
@@ -7,6 +7,7 @@
 using System.ComponentModel.Composition;
 using FineCodeCoverage.Core.Utilities;
 using System.Threading;
+using FineCodeCoverage.Output;
 
 namespace FineCodeCoverage.Engine.OpenCover
 {
diff --git a/SharedProject/Core/ReportGenerator/ReportGeneratorUtil.cs b/SharedProject/Core/ReportGenerator/ReportGeneratorUtil.cs
@@ -19,6 +19,7 @@
 using ReportGeneratorPlugins;
 using System.Threading;
 using System.Xml.Linq;
+using FineCodeCoverage.Impl;
 
 namespace FineCodeCoverage.Engine.ReportGenerator
 {
@@ -1767,7 +1768,8 @@ private string GetDummyReportToProcess()
 
         public void LogCoverageProcess(string message)
         {
-			eventAggregator.SendMessage(new InvokeScriptMessage(CoverageLogJSFunctionName, message));
+			message = $"{NowForLog.Get()} : {message}";
+            eventAggregator.SendMessage(new InvokeScriptMessage(CoverageLogJSFunctionName, message));
 			logs.Add(message);
 		}
 
diff --git a/SharedProject/Core/SourceFileOpener.cs b/SharedProject/Core/SourceFileOpener.cs
@@ -4,6 +4,7 @@
 using EnvDTE;
 using EnvDTE80;
 using FineCodeCoverage.Engine.Cobertura;
+using FineCodeCoverage.Output;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Threading;
 
diff --git a/SharedProject/Core/Utilities/FileSystemInfoDeleteExtensions.cs b/SharedProject/Core/Utilities/FileSystemInfoDeleteExtensions.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿using FineCodeCoverage.Output;
+using System;
 using System.IO;
 
 namespace FineCodeCoverage.Core.Utilities
diff --git a/SharedProject/Core/Utilities/ProcessResponseProcessor.cs b/SharedProject/Core/Utilities/ProcessResponseProcessor.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿using FineCodeCoverage.Output;
+using System;
 using System.ComponentModel.Composition;
 
 namespace FineCodeCoverage.Core.Utilities
diff --git a/SharedProject/Editor/DynamicCoverage/Management/BufferLineCoverage.cs b/SharedProject/Editor/DynamicCoverage/Management/BufferLineCoverage.cs
@@ -7,6 +7,7 @@
 using FineCodeCoverage.Engine.Model;
 using FineCodeCoverage.Impl;
 using FineCodeCoverage.Options;
+using FineCodeCoverage.Output;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
 
diff --git a/SharedProject/Editor/DynamicCoverage/Management/BufferLineCoverageFactory.cs b/SharedProject/Editor/DynamicCoverage/Management/BufferLineCoverageFactory.cs
@@ -6,6 +6,7 @@
 using FineCodeCoverage.Engine.Model;
 using FineCodeCoverage.Impl;
 using FineCodeCoverage.Options;
+using FineCodeCoverage.Output;
 
 namespace FineCodeCoverage.Editor.DynamicCoverage
 {
diff --git a/SharedProject/Editor/DynamicCoverage/TrackedLinesImpl/Construction/ContainingCodeTrackedLinesBuilder.cs b/SharedProject/Editor/DynamicCoverage/TrackedLinesImpl/Construction/ContainingCodeTrackedLinesBuilder.cs
@@ -5,6 +5,7 @@
 using FineCodeCoverage.Core.Utilities;
 using FineCodeCoverage.Editor.DynamicCoverage.TrackedLinesImpl.Construction;
 using FineCodeCoverage.Engine.Model;
+using FineCodeCoverage.Output;
 using Microsoft.VisualStudio.Text;
 
 namespace FineCodeCoverage.Editor.DynamicCoverage
diff --git a/SharedProject/Impl/ILogger.cs b/SharedProject/Impl/ILogger.cs
@@ -1,13 +1,16 @@
 ﻿using System.Collections.Generic;
 
-public interface ILogger
+namespace FineCodeCoverage.Output
 {
-    void Log(IEnumerable<object> message);
-    void Log(IEnumerable<string> message);
-    void Log(params object[] message);
-    void Log(params string[] message);
-    void LogWithoutTitle(IEnumerable<object> message);
-    void LogWithoutTitle(IEnumerable<string> message);
-    void LogWithoutTitle(params object[] message);
-    void LogWithoutTitle(params string[] message);
+    public interface ILogger
+    {
+        void Log(IEnumerable<object> message);
+        void Log(IEnumerable<string> message);
+        void Log(params object[] message);
+        void Log(params string[] message);
+        void LogWithoutTitle(IEnumerable<object> message);
+        void LogWithoutTitle(IEnumerable<string> message);
+        void LogWithoutTitle(params object[] message);
+        void LogWithoutTitle(params string[] message);
+    }
 }
diff --git a/SharedProject/Impl/Logger.cs b/SharedProject/Impl/Logger.cs
diff --git a/SharedProject/Impl/NowForLog.cs b/SharedProject/Impl/NowForLog.cs
diff --git a/SharedProject/Impl/StatusMarkerProvider.cs b/SharedProject/Impl/StatusMarkerProvider.cs
diff --git a/SharedProject/Impl/TestContainerDiscovery/TestContainerDiscoverer.cs b/SharedProject/Impl/TestContainerDiscovery/TestContainerDiscoverer.cs
diff --git a/SharedProject/Impl/TestContainerDiscovery/TestOperationFactory.cs b/SharedProject/Impl/TestContainerDiscovery/TestOperationFactory.cs
diff --git a/SharedProject/Impl/TestContainerDiscovery/TestOperationStateInvocationManager.cs b/SharedProject/Impl/TestContainerDiscovery/TestOperationStateInvocationManager.cs
diff --git a/SharedProject/Options/AppOptionsProvider.cs b/SharedProject/Options/AppOptionsProvider.cs
diff --git a/SharedProject/SharedProject.projitems b/SharedProject/SharedProject.projitems

Original file line number	Diff line number	Diff line change
`@@ -10,11 +10,10 @@`
`10`	`10`	`using FineCodeCoverage.Engine.MsTestPlatform.CodeCoverage;`
`11`	`11`	`using FineCodeCoverage.Impl;`
`12`	`12`	`using FineCodeCoverage.Options;`
`13`		`-using Microsoft.Build.Evaluation;`
`14`	`13`	`using Microsoft.VisualStudio.TestWindow.Extensibility;`
`15`	`14`	`using Moq;`
`16`	`15`	`using NUnit.Framework;`
`17`		`-using static System.Windows.Forms.VisualStyles.VisualStyleElement;`
	`16`	`+using FineCodeCoverage.Output;`
`18`	`17`
`19`	`18`	`namespace Test`
`20`	`19`	`{`
`@@ -60,7 +59,7 @@ public void Should_Return_True_For_All_Other_States_If_Was_Initialized_When_Test`
`60`	`59`	`public void Should_Log_When_Cannot_Invoke(TestOperationStates testOperationState)`
`61`	`60`	`{`
`62`	`61`	`testOperationStateInvocationManager.CanInvoke(testOperationState);`
`63`		`- mocker.Verify<ILogger>(logger => logger.Log($"Skipping {testOperationState} as FCC not initialized"));`
	`62`	`+ mocker.Verify<FineCodeCoverage.Output.ILogger>(logger => logger.Log($"Skipping {testOperationState} as FCC not initialized"));`
`64`	`63`	`}`
`65`	`64`
`66`	`65`	`}`
`@@ -379,7 +378,7 @@ public void Should_Handle_Any_Exception_In_OperationState_Changed_Handler_Loggin`
`379`	`378`	`var exception = new Exception();`
`380`	`379`	`mocker.GetMock<IFCCEngine>().Setup(engine => engine.StopCoverage()).Throws(exception);`
`381`	`380`	`RaiseTestExecutionCancelling();`
`382`		`- mocker.Verify<ILogger>(logger => logger.Log("Error processing unit test events", exception));`
	`381`	`+ mocker.Verify<FineCodeCoverage.Output.ILogger>(logger => logger.Log("Error processing unit test events", exception));`
`383`	`382`	`}`
`384`	`383`
`385`	`384`	`[TestCase(true)]`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using System.Linq;`
`5`	`5`	`using System.Threading;`
`6`	`6`	`using FineCodeCoverage.Options;`
	`7`	`+using FineCodeCoverage.Output;`
`7`	`8`
`8`	`9`	`namespace FineCodeCoverage.Engine`
`9`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using System.ComponentModel.Composition;`
`2`	`2`	`using FineCodeCoverage.Core.Utilities;`
`3`	`3`	`using FineCodeCoverage.Engine.Model;`
	`4`	`+using FineCodeCoverage.Output;`
`4`	`5`
`5`	`6`	`namespace FineCodeCoverage.Engine.Coverlet`
`6`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`using System.Threading.Tasks;`
`7`	`7`	`using FineCodeCoverage.Core.Utilities;`
`8`	`8`	`using FineCodeCoverage.Engine.Model;`
	`9`	`+using FineCodeCoverage.Output;`
`9`	`10`
`10`	`11`	`namespace FineCodeCoverage.Engine.Coverlet`
`11`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using System.ComponentModel.Composition;`
`4`	`4`	`using System.Linq;`
`5`	`5`	`using FineCodeCoverage.Core.Utilities;`
	`6`	`+using FineCodeCoverage.Output;`
`6`	`7`
`7`	`8`	`namespace FineCodeCoverage.Engine.Coverlet`
`8`	`9`	`{`