From d01c846ca5e567585ace7fe8b73b2c48a3586e1c Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 1 Sep 2009 12:49:52 +0400 Subject: [PATCH] decoupling testRunner from idea-rt --- .../execution/testframework/Filter.java | 21 ------------------- .../execution/testframework/LvcsHelper.java | 9 +------- 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/platform/testRunner/src/com/intellij/execution/testframework/Filter.java b/platform/testRunner/src/com/intellij/execution/testframework/Filter.java index 2de95e5f6c60..97ba50d6fcc8 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/Filter.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/Filter.java @@ -62,33 +62,12 @@ public abstract class Filter { } }; - public static final Filter TEST_CASE = new Filter() { - public boolean shouldAccept(final AbstractTestProxy test) { - return test.shouldRun(); - } - }; - - public static final Filter IN_PROGRESS = new Filter() { - public boolean shouldAccept(final AbstractTestProxy test) { - return test.isInProgress(); - } - }; - public static final Filter LEAF = new Filter() { public boolean shouldAccept(final AbstractTestProxy test) { return test.isLeaf(); } }; - public static final Filter RUNNING = new Filter() { - public boolean shouldAccept(final AbstractTestProxy test) { - return test.getMagnitude() == PoolOfTestStates.RUNNING_INDEX; - } - }; - - public static final Filter NOT_LEAF = LEAF.not(); - public static final Filter RUNNING_LEAF = RUNNING.and(LEAF); - public static final Filter DEFECTIVE_LEAF = DEFECT.and(LEAF); private static class AndFilter extends Filter { diff --git a/platform/testRunner/src/com/intellij/execution/testframework/LvcsHelper.java b/platform/testRunner/src/com/intellij/execution/testframework/LvcsHelper.java index 65a6d8861dda..82598439fecf 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/LvcsHelper.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/LvcsHelper.java @@ -6,7 +6,6 @@ package com.intellij.execution.testframework; import com.intellij.execution.ExecutionBundle; import com.intellij.history.LocalHistory; -import com.intellij.rt.execution.junit.states.PoolOfTestStates; import java.awt.*; @@ -24,13 +23,7 @@ public class LvcsHelper { } else { color = GREEN.getRGB(); - - if (model.getRoot().getMagnitude() != PoolOfTestStates.PASSED_INDEX) { - label = ExecutionBundle.message("tests.passed.with.warnings.message"); - } - else { - label = ExecutionBundle.message("junit.runing.info.tests.passed.label"); - } + label = ExecutionBundle.message("junit.runing.info.tests.passed.label"); } final TestConsoleProperties consoleProperties = model.getProperties(); String name = label + " " + consoleProperties.getConfiguration().getName();