From cf3375848a9f0d158bf1ae71dc61585c9f2a7dd3 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Thu, 10 Dec 2015 18:03:13 +0100 Subject: [PATCH] tests: do not include ignored in rerun failed (IDEA-149067) --- .../GeneralToSMTRunnerEventsConvertorTest.java | 5 +++++ .../actions/AbstractRerunFailedTestsAction.java | 12 +++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertorTest.java b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertorTest.java index e4231cfbd586..505215eb7626 100644 --- a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertorTest.java +++ b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertorTest.java @@ -16,7 +16,9 @@ package com.intellij.execution.testframework.sm.runner; import com.intellij.execution.runners.ExecutionEnvironment; +import com.intellij.execution.testframework.Filter; import com.intellij.execution.testframework.TestConsoleProperties; +import com.intellij.execution.testframework.actions.AbstractRerunFailedTestsAction; import com.intellij.execution.testframework.sm.Marker; import com.intellij.execution.testframework.sm.runner.events.*; import com.intellij.execution.testframework.sm.runner.history.ImportedToGeneralTestEventsConverter; @@ -207,6 +209,9 @@ public class GeneralToSMTRunnerEventsConvertorTest extends BaseSMTRunnerTestCase assertNotNull(proxy); assertTrue(proxy.isDefect()); assertFalse(proxy.isInProgress()); + + final Filter filter = AbstractRerunFailedTestsAction.getFailuresFilter(myConsole.getProperties()); + assertFalse(filter.shouldAccept(proxy)); } public void testOnTestFinished() { diff --git a/platform/testRunner/src/com/intellij/execution/testframework/actions/AbstractRerunFailedTestsAction.java b/platform/testRunner/src/com/intellij/execution/testframework/actions/AbstractRerunFailedTestsAction.java index 50570075d36b..98c7cab7f948 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/actions/AbstractRerunFailedTestsAction.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/actions/AbstractRerunFailedTestsAction.java @@ -47,6 +47,7 @@ import com.intellij.util.ui.UIUtil; import org.jdom.Element; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.TestOnly; import javax.swing.*; import java.awt.*; @@ -124,10 +125,15 @@ public class AbstractRerunFailedTestsAction extends AnAction implements AnAction } protected Filter getFailuresFilter() { - if (TestConsoleProperties.INCLUDE_NON_STARTED_IN_RERUN_FAILED.value(myConsoleProperties)) { - return Filter.NOT_PASSED.and(Filter.IGNORED.not()).or(Filter.FAILED_OR_INTERRUPTED); + return getFailuresFilter(myConsoleProperties); + } + + @TestOnly + public static Filter getFailuresFilter(TestConsoleProperties consoleProperties) { + if (TestConsoleProperties.INCLUDE_NON_STARTED_IN_RERUN_FAILED.value(consoleProperties)) { + return Filter.NOT_PASSED.or(Filter.FAILED_OR_INTERRUPTED).and(Filter.IGNORED.not()); } - return Filter.FAILED_OR_INTERRUPTED; + return Filter.FAILED_OR_INTERRUPTED.and(Filter.IGNORED.not()); } @Override