From 3aae0d5d8afb666b9cf04ab4417885cc7d8cbc35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Jare=C5=A1?= <me@jakubjares.com>
Date: Wed, 22 Jan 2025 11:10:17 +0100
Subject: [PATCH] Fix help

---
 .../dotnet-test/Terminal/TerminalTestReporter.cs   | 11 ++++++++---
 .../commands/dotnet-test/TestingPlatformCommand.cs | 14 ++++----------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/Cli/dotnet/commands/dotnet-test/Terminal/TerminalTestReporter.cs b/src/Cli/dotnet/commands/dotnet-test/Terminal/TerminalTestReporter.cs
index d9c621862c39..ef1e789df7a4 100644
--- a/src/Cli/dotnet/commands/dotnet-test/Terminal/TerminalTestReporter.cs
+++ b/src/Cli/dotnet/commands/dotnet-test/Terminal/TerminalTestReporter.cs
@@ -47,6 +47,7 @@ internal event EventHandler OnProgressStopUpdate
 
     private readonly uint? _originalConsoleMode;
     private bool _isDiscovery;
+    private bool _isHelp;
     private DateTimeOffset? _testExecutionStartTime;
 
     private DateTimeOffset? _testExecutionEndTime;
@@ -147,9 +148,10 @@ public TerminalTestReporter(IConsole console, TerminalTestReporterOptions option
         _terminalWithProgress = terminalWithProgress;
     }
 
-    public void TestExecutionStarted(DateTimeOffset testStartTime, int workerCount, bool isDiscovery)
+    public void TestExecutionStarted(DateTimeOffset testStartTime, int workerCount, bool isDiscovery, bool isHelp)
     {
         _isDiscovery = isDiscovery;
+        _isHelp = isHelp;
         _testExecutionStartTime = testStartTime;
         _terminalWithProgress.StartShowingProgress(workerCount);
     }
@@ -189,7 +191,10 @@ public void TestExecutionCompleted(DateTimeOffset endTime)
         _testExecutionEndTime = endTime;
         _terminalWithProgress.StopShowingProgress();
 
-        _terminalWithProgress.WriteToTerminal(_isDiscovery ? AppendTestDiscoverySummary : AppendTestRunSummary);
+        if (!_isHelp)
+        {
+            _terminalWithProgress.WriteToTerminal(_isDiscovery ? AppendTestDiscoverySummary : AppendTestRunSummary);
+        }
 
         NativeMethods.RestoreConsoleMode(_originalConsoleMode);
         _assemblies.Clear();
@@ -757,7 +762,7 @@ internal void AssemblyRunCompleted(string assembly, string? targetFramework, str
 
         _terminalWithProgress.RemoveWorker(assemblyRun.SlotIndex);
 
-        if (!_isDiscovery && _options.ShowAssembly && _options.ShowAssemblyStartAndComplete)
+        if (!_isHelp && !_isDiscovery && _options.ShowAssembly && _options.ShowAssemblyStartAndComplete)
         {
             _terminalWithProgress.WriteToTerminal(terminal => AppendAssemblySummary(assemblyRun, terminal));
         }
diff --git a/src/Cli/dotnet/commands/dotnet-test/TestingPlatformCommand.cs b/src/Cli/dotnet/commands/dotnet-test/TestingPlatformCommand.cs
index 17e4f55d9991..9cad28d9bcf5 100644
--- a/src/Cli/dotnet/commands/dotnet-test/TestingPlatformCommand.cs
+++ b/src/Cli/dotnet/commands/dotnet-test/TestingPlatformCommand.cs
@@ -42,7 +42,7 @@ public int Run(ParseResult parseResult)
                 _args = [.. parseResult.UnmatchedTokens];
                 _isHelp = ContainsHelpOption(parseResult.GetArguments());
 
-                InitializeOutput(degreeOfParallelism);
+                InitializeOutput(degreeOfParallelism, _isHelp);
 
                 bool filterModeEnabled = parseResult.HasOption(TestingPlatformOptions.TestModulesFilterOption);
                 if (_isHelp)
@@ -100,7 +100,7 @@ private void SetupCancelKeyPressHandler()
             };
         }
 
-        private void InitializeOutput(int degreeOfParallelism)
+        private void InitializeOutput(int degreeOfParallelism, bool isHelp)
         {
             var console = new SystemConsole();
             _output = new TerminalTestReporter(console, new TerminalTestReporterOptions()
@@ -112,10 +112,7 @@ private void InitializeOutput(int degreeOfParallelism)
                 ShowAssemblyStartAndComplete = true,
             });
 
-            if (!_isHelp)
-            {
-                _output.TestExecutionStarted(DateTimeOffset.Now, degreeOfParallelism, _isDiscovery);
-            }
+            _output.TestExecutionStarted(DateTimeOffset.Now, degreeOfParallelism, _isDiscovery, _isHelp);
         }
 
         private void InitializeHelpActionQueue(int degreeOfParallelism, BuildConfigurationOptions buildConfigurationOptions, bool filterModeEnabled)
@@ -174,10 +171,7 @@ private void CompleteRun()
         {
             if (Interlocked.CompareExchange(ref _cancelled, 1, 0) == 0)
             {
-                if (!_isHelp)
-                {
-                    _output?.TestExecutionCompleted(DateTimeOffset.Now);
-                }
+                _output?.TestExecutionCompleted(DateTimeOffset.Now);
             }
         }