MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

tests: do not include ignored in rerun failed (IDEA-149067)

Browse Source
This commit is contained in:
Anna Kozlova
2015-12-10 18:28:55 +01:00
parent b5cb7cc24a
commit cf3375848a
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertorTest.java
+5
View File
@@ -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() {
platform/testRunner/src/com/intellij/execution/testframework/actions/AbstractRerunFailedTestsAction.java
+9 -3
View File
@@ -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