From 977cf474ee1321e302d52e2e44aad9094b45cbc1 Mon Sep 17 00:00:00 2001 From: Olivier DALET Date: Sat, 26 Jun 2021 16:45:37 +0200 Subject: [PATCH] Fixes #799 by testing logged messages against "null or whitespace" instead of "null or empty" --- .../Execution/TestExecutionManager.cs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/Adapter/MSTest.CoreAdapter/Execution/TestExecutionManager.cs b/src/Adapter/MSTest.CoreAdapter/Execution/TestExecutionManager.cs index 2a1bce1f45..dc95db6083 100644 --- a/src/Adapter/MSTest.CoreAdapter/Execution/TestExecutionManager.cs +++ b/src/Adapter/MSTest.CoreAdapter/Execution/TestExecutionManager.cs @@ -469,17 +469,17 @@ private void LogCleanupResult(ITestExecutionRecorder testExecutionRecorder, RunC { Debug.Assert(testExecutionRecorder != null, "Logger should not be null"); - if (!string.IsNullOrEmpty(result.StandardOut)) + if (!string.IsNullOrWhiteSpace(result.StandardOut)) { testExecutionRecorder.SendMessage(TestMessageLevel.Informational, result.StandardOut); } - if (!string.IsNullOrEmpty(result.DebugTrace)) + if (!string.IsNullOrWhiteSpace(result.DebugTrace)) { testExecutionRecorder.SendMessage(TestMessageLevel.Informational, result.DebugTrace); } - if (!string.IsNullOrEmpty(result.StandardError)) + if (!string.IsNullOrWhiteSpace(result.StandardError)) { testExecutionRecorder.SendMessage( MSTestSettings.CurrentSettings.TreatClassAndAssemblyCleanupWarningsAsErrors ? TestMessageLevel.Error : TestMessageLevel.Warning, @@ -490,9 +490,12 @@ private void LogCleanupResult(ITestExecutionRecorder testExecutionRecorder, RunC { foreach (string warning in result.Warnings) { - testExecutionRecorder.SendMessage( - MSTestSettings.CurrentSettings.TreatClassAndAssemblyCleanupWarningsAsErrors ? TestMessageLevel.Error : TestMessageLevel.Warning, - warning); + if (!string.IsNullOrWhiteSpace(warning)) + { + testExecutionRecorder.SendMessage( + MSTestSettings.CurrentSettings.TreatClassAndAssemblyCleanupWarningsAsErrors ? TestMessageLevel.Error : TestMessageLevel.Warning, + warning); + } } } }