Skip to content

Commit 50c322c

Browse files
odaletodalet-addup
andauthored
Fixes microsoft#799 by testing logged messages against "null or whitespace" instead of "null or empty" (microsoft#892)
Co-authored-by: Olivier DALET <[email protected]>
1 parent 2d0f311 commit 50c322c

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

src/Adapter/MSTest.CoreAdapter/Execution/TestExecutionManager.cs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -469,17 +469,17 @@ private void LogCleanupResult(ITestExecutionRecorder testExecutionRecorder, RunC
469469
{
470470
Debug.Assert(testExecutionRecorder != null, "Logger should not be null");
471471

472-
if (!string.IsNullOrEmpty(result.StandardOut))
472+
if (!string.IsNullOrWhiteSpace(result.StandardOut))
473473
{
474474
testExecutionRecorder.SendMessage(TestMessageLevel.Informational, result.StandardOut);
475475
}
476476

477-
if (!string.IsNullOrEmpty(result.DebugTrace))
477+
if (!string.IsNullOrWhiteSpace(result.DebugTrace))
478478
{
479479
testExecutionRecorder.SendMessage(TestMessageLevel.Informational, result.DebugTrace);
480480
}
481481

482-
if (!string.IsNullOrEmpty(result.StandardError))
482+
if (!string.IsNullOrWhiteSpace(result.StandardError))
483483
{
484484
testExecutionRecorder.SendMessage(
485485
MSTestSettings.CurrentSettings.TreatClassAndAssemblyCleanupWarningsAsErrors ? TestMessageLevel.Error : TestMessageLevel.Warning,
@@ -490,9 +490,12 @@ private void LogCleanupResult(ITestExecutionRecorder testExecutionRecorder, RunC
490490
{
491491
foreach (string warning in result.Warnings)
492492
{
493-
testExecutionRecorder.SendMessage(
494-
MSTestSettings.CurrentSettings.TreatClassAndAssemblyCleanupWarningsAsErrors ? TestMessageLevel.Error : TestMessageLevel.Warning,
495-
warning);
493+
if (!string.IsNullOrWhiteSpace(warning))
494+
{
495+
testExecutionRecorder.SendMessage(
496+
MSTestSettings.CurrentSettings.TreatClassAndAssemblyCleanupWarningsAsErrors ? TestMessageLevel.Error : TestMessageLevel.Warning,
497+
warning);
498+
}
496499
}
497500
}
498501
}

0 commit comments

Comments
 (0)