Skip to content

Commit

Permalink
Fixes microsoft#799 by testing logged messages against "null or white…
Browse files Browse the repository at this point in the history
…space" instead of "null or empty"
  • Loading branch information
odalet-addup committed Jun 26, 2021
1 parent 2d0f311 commit 977cf47
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions src/Adapter/MSTest.CoreAdapter/Execution/TestExecutionManager.cs
Expand Up @@ -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,
Expand All @@ -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);
}
}
}
}
Expand Down

0 comments on commit 977cf47

Please sign in to comment.