From 902165cf2ef085fa79a6b110c7554496c85a14c3 Mon Sep 17 00:00:00 2001 From: anna Date: Tue, 3 Nov 2009 21:39:37 +0300 Subject: [PATCH] junit: initial magnitude for suite state should be NOT_RUN (updateMagnitude should check the case) --- .../junit/src/com/intellij/execution/junit2/SuiteState.java | 6 ++++-- .../src/com/intellij/execution/junit2/ui/TestRenderer.java | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/junit/src/com/intellij/execution/junit2/SuiteState.java b/plugins/junit/src/com/intellij/execution/junit2/SuiteState.java index 2c77fc3956c0..26c541c6707c 100644 --- a/plugins/junit/src/com/intellij/execution/junit2/SuiteState.java +++ b/plugins/junit/src/com/intellij/execution/junit2/SuiteState.java @@ -28,7 +28,7 @@ import java.util.List; public class SuiteState extends TestState { private final TestProxy myTest; - private int myMaxMagnitude = -1; + private int myMaxMagnitude = PoolOfTestStates.NOT_RUN_INDEX; private boolean myHasRunning; private final StateCache myCache = new StateCache(); @@ -96,7 +96,9 @@ public class SuiteState extends TestState { } public void updateMagnitude(int magnitude) { - if (myMaxMagnitude < magnitude) { + if (myMaxMagnitude == PoolOfTestStates.NOT_RUN_INDEX) { + myMaxMagnitude = magnitude; + } else if (myMaxMagnitude < magnitude) { myMaxMagnitude = magnitude; } } diff --git a/plugins/junit/src/com/intellij/execution/junit2/ui/TestRenderer.java b/plugins/junit/src/com/intellij/execution/junit2/ui/TestRenderer.java index 5283fd55c107..6f478670ab50 100644 --- a/plugins/junit/src/com/intellij/execution/junit2/ui/TestRenderer.java +++ b/plugins/junit/src/com/intellij/execution/junit2/ui/TestRenderer.java @@ -54,8 +54,6 @@ class TestRenderer { mapIcon(PoolOfTestStates.COMPARISON_FAILURE, PoolOfTestIcons.FAILED_ICON); mapIcon(PoolOfTestStates.ERROR_INDEX, PoolOfTestIcons.ERROR_ICON); mapIcon(PoolOfTestStates.IGNORED_INDEX, PoolOfTestIcons.IGNORED_ICON); - - mapIcon(-1, PoolOfTestIcons.NOT_RAN); } private static void mapIcon(final int index, final Icon icon) {