Progress

Author: Youssef1313

src/YTest.MTP.XUnit2/MTPFramework/TestingPlatformBuilderHook.cs

@@ -20,6 +20,6 @@ public static void AddExtensions(ITestApplicationBuilder testApplicationBuilder,
         var trxReportCapability = new XUnit2MTPTestTrxCapability();
         testApplicationBuilder.RegisterTestFramework(
             capabilitiesFactory: _ => new TestFrameworkCapabilities(trxReportCapability),
-            frameworkFactory: (_, sp) => new XUnit2MTPTestFramework(trxReportCapability, sp.GetCommandLineOptions(), sp.GetLoggerFactory()));
+            frameworkFactory: (_, sp) => new XUnit2MTPTestFramework(trxReportCapability, sp.GetCommandLineOptions(), sp.GetOutputDevice(), sp.GetLoggerFactory()));
     }
 }

src/YTest.MTP.XUnit2/MTPFramework/XUnit2MTPTestFramework.cs

@@ -8,29 +8,36 @@
 using Microsoft.Testing.Extensions.TrxReport.Abstractions;
 using Microsoft.Testing.Platform.CommandLine;
 using Microsoft.Testing.Platform.Extensions.Messages;
+using Microsoft.Testing.Platform.Extensions.OutputDevice;
 using Microsoft.Testing.Platform.Extensions.TestFramework;
 using Microsoft.Testing.Platform.Logging;
+using Microsoft.Testing.Platform.OutputDevice;
 using Microsoft.Testing.Platform.Requests;
 using Xunit;
 using Xunit.Abstractions;
 using YTest.MTP.XUnit2.Filter;
 
 namespace YTest.MTP.XUnit2;
 
-internal sealed class XUnit2MTPTestFramework : Microsoft.Testing.Platform.Extensions.TestFramework.ITestFramework, IDataProducer
+internal sealed class XUnit2MTPTestFramework : Microsoft.Testing.Platform.Extensions.TestFramework.ITestFramework,
+    IDataProducer,
+    IOutputDeviceDataProducer
 {
     private readonly XUnit2MTPTestTrxCapability _trxReportCapability;
     private readonly ICommandLineOptions _commandLineOptions;
+    private readonly IOutputDevice _outputDevice;
     private readonly ILoggerFactory _loggerFactory;
     private readonly ILogger<XUnit2MTPTestFramework> _logger;
 
     public XUnit2MTPTestFramework(
         XUnit2MTPTestTrxCapability trxReportCapability,
         ICommandLineOptions commandLineOptions,
+        IOutputDevice outputDevice,
         ILoggerFactory loggerFactory)
     {
         _trxReportCapability = trxReportCapability;
         _commandLineOptions = commandLineOptions;
+        _outputDevice = outputDevice;
         _loggerFactory = loggerFactory;
 
         _logger = loggerFactory.CreateLogger<XUnit2MTPTestFramework>();
@@ -102,8 +109,8 @@ private async Task DiscoverTestsAsync(
         string assemblyPath,
         TestCaseFilterExpression? filter)
     {
-        var configuration = GetConfiguration(assemblyPath);
-        var diagnosticMessageSink = GetDiagnosticMessageSink(assemblyPath, configuration);
+        var configuration = await GetConfigurationAsync(assemblyPath, context.CancellationToken);
+        var diagnosticMessageSink = GetDiagnosticMessageSink(assemblyPath, configuration, context.CancellationToken);
         using var frontController = GetFrontController(assemblyPath, configuration, diagnosticMessageSink);
         var testCases = await DiscoverAsync(frontController, configuration, context.CancellationToken);
 
@@ -174,8 +181,8 @@ private async Task RunTestsAsync(
         string assemblyPath,
         TestCaseFilterExpression? filter)
     {
-        var configuration = GetConfiguration(assemblyPath);
-        var diagnosticMessageSink = GetDiagnosticMessageSink(assemblyPath, configuration);
+        var configuration = await GetConfigurationAsync(assemblyPath, context.CancellationToken);
+        var diagnosticMessageSink = GetDiagnosticMessageSink(assemblyPath, configuration, context.CancellationToken);
         using var frontController = GetFrontController(assemblyPath, configuration, diagnosticMessageSink);
         var testCases = await DiscoverAsync(frontController, configuration, context.CancellationToken);
 
@@ -237,7 +244,7 @@ private static bool MatchesFilter(ITestExecutionFilter mtpFilter, TestCaseFilter
         };
     }
 
-    private TestAssemblyConfiguration GetConfiguration(string assemblyPath)
+    private async Task<TestAssemblyConfiguration> GetConfigurationAsync(string assemblyPath, CancellationToken cancellationToken)
     {
         var warnings = new List<string>();
         var configuration = ConfigReader.Load(assemblyPath, configFileName: null, warnings);
@@ -251,6 +258,7 @@ private TestAssemblyConfiguration GetConfiguration(string assemblyPath)
         foreach (var warning in warnings)
         {
             _logger.LogWarning(warning);
+            await _outputDevice.DisplayAsync(this, new WarningMessageOutputDeviceData(warning), cancellationToken);
         }
 
         return configuration;
@@ -267,6 +275,6 @@ private static XunitFrontController GetFrontController(string assemblyPath, Test
             sourceInformationProvider: null,
             diagnosticMessageSink);
 
-    private MTPDiagnosticMessageSink GetDiagnosticMessageSink(string assemblyPath, TestAssemblyConfiguration configuration)
-        => new MTPDiagnosticMessageSink(_loggerFactory, Path.GetFileNameWithoutExtension(assemblyPath), configuration.DiagnosticMessagesOrDefault);
+    private MTPDiagnosticMessageSink GetDiagnosticMessageSink(string assemblyPath, TestAssemblyConfiguration configuration, CancellationToken cancellationToken)
+        => new MTPDiagnosticMessageSink(data => _outputDevice.DisplayAsync(this, data, cancellationToken).GetAwaiter().GetResult(), _loggerFactory, Path.GetFileNameWithoutExtension(assemblyPath), configuration.DiagnosticMessagesOrDefault);
 }

src/YTest.MTP.XUnit2/XUnitSinks/MTPDiagnosticMessageSink.cs

@@ -1,20 +1,25 @@
-using Microsoft.Testing.Platform.Logging;
+using System;
+using Microsoft.Testing.Platform.Logging;
+using Microsoft.Testing.Platform.OutputDevice;
 using Xunit;
 using Xunit.Abstractions;
 
 namespace YTest.MTP.XUnit2;
 
 internal sealed class MTPDiagnosticMessageSink : LongLivedMarshalByRefObject, IMessageSink
 {
+    private readonly Action<IOutputDeviceData> _displayOutput;
     private readonly ILogger<MTPDiagnosticMessageSink> _logger;
     private readonly string _header;
     private readonly bool _showDiagnostics;
 
     public MTPDiagnosticMessageSink(
+        Action<IOutputDeviceData> displayOutput,
         ILoggerFactory loggerFactory,
         string? assemblyDisplayName = null,
         bool showDiagnostics = false)
     {
+        _displayOutput = displayOutput;
         _logger = loggerFactory.CreateLogger<MTPDiagnosticMessageSink>();
         _header = assemblyDisplayName is null ? string.Empty : assemblyDisplayName + ": ";
         _showDiagnostics = showDiagnostics;
@@ -29,12 +34,15 @@ public bool OnMessage(IMessageSinkMessage message)
 
         if (message is IDiagnosticMessage diagMessage)
         {
-            _logger.LogWarning($"{_header}{diagMessage.Message}");
+            string warning = $"{_header}{diagMessage.Message}";
+            _logger.LogWarning(warning);
+            _displayOutput(new WarningMessageOutputDeviceData(warning));
         }
         else if (message is IErrorMessage errorMessage)
         {
             var exception = new XUnitFailureException(errorMessage);
             _logger.LogError(exception);
+            _displayOutput(new ErrorMessageOutputDeviceData(exception.ToString()));
         }
 
         return true;