From babf29a948cbf50ea0999076a79f6dc3c549f430 Mon Sep 17 00:00:00 2001 From: Sergey Simonchik Date: Fri, 17 Jan 2014 15:37:44 +0400 Subject: [PATCH] print nothing for an ignored test if ignoredMsg is empty --- .../testframework/sm/runner/states/TestIgnoredState.java | 5 +---- .../testframework/sm/runner/SMTRunnerConsoleTest.java | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/states/TestIgnoredState.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/states/TestIgnoredState.java index 38a4d94e1789..f2363a236b46 100644 --- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/states/TestIgnoredState.java +++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/states/TestIgnoredState.java @@ -69,10 +69,7 @@ public class TestIgnoredState extends AbstractState { if (myText != null) { printer.print(myText, ConsoleViewContentType.SYSTEM_OUTPUT); } - if (StringUtil.isEmptyOrSpaces(myStacktrace)) { - printer.print(CompositePrintable.NEW_LINE, ConsoleViewContentType.SYSTEM_OUTPUT); - } - else { + if (!StringUtil.isEmptyOrSpaces(myStacktrace)) { printer.print(CompositePrintable.NEW_LINE, ConsoleViewContentType.ERROR_OUTPUT); printer.mark(); printer.print(myStacktrace, ConsoleViewContentType.ERROR_OUTPUT); diff --git a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/SMTRunnerConsoleTest.java b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/SMTRunnerConsoleTest.java index 4593c6f46777..4e85c6cc384d 100644 --- a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/SMTRunnerConsoleTest.java +++ b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/SMTRunnerConsoleTest.java @@ -394,7 +394,7 @@ public class SMTRunnerConsoleTest extends BaseSMTRunnerTestCase { myEventsProcessor.onTestOutput(new TestOutputEvent("my_test", "stdout1 ", true)); myEventsProcessor.onTestOutput(new TestOutputEvent("my_test", "stderr1 ", false)); - assertAllOutputs(myMockResettablePrinter, "stdout1 ", "stderr1 ", "\nignored msg\n"); + assertAllOutputs(myMockResettablePrinter, "stdout1 ", "stderr1 ", "\nignored msg"); final MockPrinter mockPrinter1 = new MockPrinter(true); mockPrinter1.onNewAvailable(myTest1);