From e9163e470c43c4a3f8b48fe1f3e97a220f53439e Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@intellij.com>
Date: Tue, 1 Sep 2009 12:55:23 +0400
Subject: [PATCH] decoupling testRunner from idea-rt

---
 .../intellij/execution/testframework/AbstractTestProxy.java   | 2 ++
 .../src/com/intellij/execution/testframework/Filter.java      | 4 +---
 platform/testRunner/testRunner.iml                            | 1 -
 .../execution/testframework/sm/runner/SMTestProxy.java        | 4 ++++
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/platform/testRunner/src/com/intellij/execution/testframework/AbstractTestProxy.java b/platform/testRunner/src/com/intellij/execution/testframework/AbstractTestProxy.java
index ece267ec02a0..2c37c196e304 100644
--- a/platform/testRunner/src/com/intellij/execution/testframework/AbstractTestProxy.java
+++ b/platform/testRunner/src/com/intellij/execution/testframework/AbstractTestProxy.java
@@ -25,6 +25,8 @@ public interface AbstractTestProxy {
 
   boolean isLeaf();
 
+  boolean isPassed();
+
   String getName();
 
   Location getLocation(final Project project);
diff --git a/platform/testRunner/src/com/intellij/execution/testframework/Filter.java b/platform/testRunner/src/com/intellij/execution/testframework/Filter.java
index 97ba50d6fcc8..ded023a760fc 100644
--- a/platform/testRunner/src/com/intellij/execution/testframework/Filter.java
+++ b/platform/testRunner/src/com/intellij/execution/testframework/Filter.java
@@ -1,7 +1,5 @@
 package com.intellij.execution.testframework;
 
-import com.intellij.rt.execution.junit.states.PoolOfTestStates;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -58,7 +56,7 @@ public abstract class Filter {
 
   public static final Filter NOT_PASSED = new Filter() {
     public boolean shouldAccept(final AbstractTestProxy test) {
-      return test.getMagnitude() > PoolOfTestStates.PASSED_INDEX;
+      return !test.isPassed();
     }
   };
 
diff --git a/platform/testRunner/testRunner.iml b/platform/testRunner/testRunner.iml
index 987945a367dc..21d34cc6920b 100644
--- a/platform/testRunner/testRunner.iml
+++ b/platform/testRunner/testRunner.iml
@@ -9,7 +9,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="platform-api" />
     <orderEntry type="module" module-name="lang-impl" />
-    <orderEntry type="module" module-name="idea_rt" />
     <orderEntry type="module" module-name="platform-impl" />
   </component>
 </module>
diff --git a/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTestProxy.java b/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTestProxy.java
index c74228556cc6..053bf2ff1cec 100644
--- a/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTestProxy.java
+++ b/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTestProxy.java
@@ -77,6 +77,10 @@ public class SMTestProxy extends CompositePrintable implements PrintableTestProx
     return myChildren == null || myChildren.isEmpty();
   }
 
+  public boolean isPassed() {
+    return myState.getMagnitude() == TestStateInfo.Magnitude.SKIPPED_INDEX || myState.getMagnitude() != TestStateInfo.Magnitude.COMPLETE_INDEX; 
+  }
+
   public void addChild(final SMTestProxy child) {
     if (myChildren == null) {
       myChildren = new ArrayList<SMTestProxy>();