Rename messages

microsoft · Feb 7, 2024 · 3d7c420 · 3d7c420
1 parent 890ade5
commit 3d7c420
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 50 deletions.
diff --git a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.targets b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.targets
@@ -36,12 +36,12 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <!--
     Used when called from dotnet msbuild command line: uses MSBuild logs but does not allow for console colorization.
-    We call to empty target _VSTestMSBuild2 to mark start of the actual test running, in case we need to do build before
+    We call to empty target _TestRunStarted to mark start of the actual test running, in case we need to do build before
     the test running. This is used in MSBuild Terminal Logger to detect that the current project will run some tests.
   -->
   <Target Name="_VSTestMSBuild" Condition="'$(IsTestProject)' == 'true'">
     <CallTarget Condition="!$(VSTestNoBuild)" Targets="BuildProject" />
-    <CallTarget Targets="_VSTestMSBuild2" />
+    <CallTarget Targets="_TestRunStarted" />
 
     <VSTestTask2
       TestFileFullPath="$(TargetPath)"
@@ -72,7 +72,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     />
   </Target>
 
-  <Target Name="_VSTestMSBuild2" />
+  <Target Name="_TestRunStarted" />
 
   <!-- Used when called from dotnet test command line: does not use MSBuild logs to allow for console colorization -->
   <Target Name="_VSTestConsole">

diff --git a/src/Microsoft.TestPlatform.Build/Tasks/VSTestTask2.cs b/src/Microsoft.TestPlatform.Build/Tasks/VSTestTask2.cs
@@ -83,13 +83,6 @@ protected override void LogEventsFromTextOutput(string singleLine, MessageImport
                     Log.LogError(data[0]);
                     break;
 
-                case "run-start1":
-                    if (useTerminalLogger)
-                    {
-                        Log.LogMessage("VSTESTTLSTART", null, null, null, 0, 0, 0, 0, MessageImportance.High, data[0]);
-                    }
-                    break;
-
                 case "run-cancel1":
                 case "run-abort1":
                     Log.LogError(data[0]);
@@ -103,7 +96,7 @@ protected override void LogEventsFromTextOutput(string singleLine, MessageImport
                     var visibleMessage = "Run completed";
                     if (useTerminalLogger)
                     {
-                        var message = new ExtendedBuildMessageEventArgs("VSTESTTLFINISH", visibleMessage, null, null, MessageImportance.High)
+                        var message = new ExtendedBuildMessageEventArgs("TLTESTFINISH", visibleMessage, null, null, MessageImportance.High)
                         {
                             ExtendedMetadata = new Dictionary<string, string?>
                             {
@@ -144,22 +137,15 @@ protected override void LogEventsFromTextOutput(string singleLine, MessageImport
                             ? testResultWithTime
                             : $"{testResultWithTime}{n}Outputs:{n}{outputs}";
 
-                        if (useTerminalLogger)
+                        var message = new ExtendedBuildMessageEventArgs("TLTESTPASSED", testPassed, null, null, MessageImportance.High)
                         {
-                            var message = new ExtendedBuildMessageEventArgs("VSTESTTLPASSED", testPassed, null, null, MessageImportance.High)
+                            ExtendedMetadata = new Dictionary<string, string?>
                             {
-                                ExtendedMetadata = new Dictionary<string, string?>
-                                {
-                                    ["localizedResult"] = data[0],
-                                    ["displayName"] = data[1],
-                                }
-                            };
-                            BuildEngine.LogMessageEvent(message);
-                        }
-                        else
-                        {
-                            Log.LogMessage(MessageImportance.Low, testPassed);
-                        }
+                                ["localizedResult"] = data[0],
+                                ["displayName"] = data[1],
+                            }
+                        };
+                        BuildEngine.LogMessageEvent(message);
                     }
                     break;
                 case "test-skipped2":
@@ -170,21 +156,15 @@ protected override void LogEventsFromTextOutput(string singleLine, MessageImport
                         var displayName = data[1];
 
                         var testSkipped = $"{indicator} {displayName}";
-                        if (useTerminalLogger)
+                        var message = new ExtendedBuildMessageEventArgs("TLTESTSKIPPED", testSkipped, null, null, MessageImportance.High)
                         {
-                            Log.LogMessage("VSTESTTLSKIPPED", null, null, null, 0, 0, 0, 0, MessageImportance.High, AsForwardedMessage(data));
-                            var message = new ExtendedBuildMessageEventArgs("VSTESTTLSKIPPED", testSkipped, null, null, MessageImportance.High)
+                            ExtendedMetadata = new Dictionary<string, string?>
                             {
-                                ExtendedMetadata = new Dictionary<string, string?>
-                                {
-                                    ["localizedResult"] = data[0],
-                                    ["displayName"] = data[1],
-                                }
-                            };
-                            BuildEngine.LogMessageEvent(message);
-                        }
-
-                        Log.LogMessage(MessageImportance.Low, testSkipped);
+                                ["localizedResult"] = data[0],
+                                ["displayName"] = data[1],
+                            }
+                        };
+                        BuildEngine.LogMessageEvent(message);
                     }
                     break;
                 case "test-failed7":

diff --git a/src/vstest.console/Internal/MSBuildLogger.cs b/src/vstest.console/Internal/MSBuildLogger.cs
@@ -62,7 +62,6 @@ public void Initialize(TestLoggerEvents events, string testRunDirectory)
         events.TestRunMessage += TestMessageHandler;
         events.TestResult += TestResultHandler;
         events.TestRunComplete += TestRunCompleteHandler;
-        events.TestRunStart += TestRunStartHandler;
     }
 
     public void Initialize(TestLoggerEvents events, Dictionary<string, string?> parameters)
@@ -86,17 +85,6 @@ private void TestMessageHandler(object? sender, TestRunMessageEventArgs e)
         }
     }
 
-    private void TestRunStartHandler(object? sender, TestRunStartEventArgs e)
-    {
-        TPDebug.Assert(Output != null, "Initialize should have been called");
-
-        var source = e.TestRunCriteria.Sources?.FirstOrDefault();
-        if (source != null)
-        {
-            SendMessage("run-start", source);
-        }
-    }
-
     private void TestRunCompleteHandler(object? sender, TestRunCompleteEventArgs e)
     {
         TPDebug.Assert(Output != null, "Initialize should have been called");