From f8ece4272a54ca11e436a457af0e9b27e6f99a6a Mon Sep 17 00:00:00 2001 From: Roman Chernyatchik Date: Fri, 11 Sep 2009 17:04:45 +0400 Subject: [PATCH] test fixed --- .../testframework/sm/runner/ui/SMTestRunnerResultsForm.java | 4 ++-- .../testframework/sm/runner/ui/TestsPresentationUtilTest.java | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsForm.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsForm.java index 409b62c1a5..4bc2cde9e1 100644 --- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsForm.java +++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsForm.java @@ -32,9 +32,9 @@ import java.awt.*; import java.awt.event.InputEvent; import java.awt.event.KeyEvent; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -import java.util.HashSet; /** * @author: Roman Chernyatchik @@ -68,7 +68,7 @@ public class SMTestRunnerResultsForm extends TestResultsPanel implements TestFra // custom progress private String myCurrentCustomProgressCategory; - private Set myMentionedCategories = new HashSet(); + private Set myMentionedCategories = new LinkedHashSet(); public SMTestRunnerResultsForm(final RunConfigurationBase runConfiguration, @NotNull final JComponent console, diff --git a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/ui/TestsPresentationUtilTest.java b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/ui/TestsPresentationUtilTest.java index cf990a42d1..3e3d6194ea 100644 --- a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/ui/TestsPresentationUtilTest.java +++ b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/ui/TestsPresentationUtilTest.java @@ -1,10 +1,10 @@ package com.intellij.execution.testframework.sm.runner.ui; import com.intellij.execution.testframework.PoolOfTestIcons; +import com.intellij.execution.testframework.sm.UITestUtil; import com.intellij.execution.testframework.sm.runner.BaseSMTRunnerTestCase; import com.intellij.execution.testframework.sm.runner.SMTRunnerConsoleProperties; import com.intellij.execution.testframework.sm.runner.SMTestProxy; -import com.intellij.execution.testframework.sm.UITestUtil; import com.intellij.execution.testframework.ui.TestsProgressAnimator; import com.intellij.ui.SimpleTextAttributes; import com.intellij.util.containers.HashSet; @@ -13,6 +13,8 @@ import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import javax.swing.*; +import java.util.LinkedHashSet; +import java.util.Set; /** * @author Roman Chernyatchik @@ -56,7 +58,7 @@ public class TestsPresentationUtilTest extends BaseSMTRunnerTestCase { assertEquals("Running: 0 of <...> ", TestsPresentationUtil.getProgressStatus_Text(0, 0, 0, 0, 0, new HashSet())); - final HashSet category = new HashSet(); + final Set category = new LinkedHashSet(); category.clear(); category.add("Scenarios"); @@ -73,7 +75,7 @@ public class TestsPresentationUtilTest extends BaseSMTRunnerTestCase { category.add("Cucumbers"); category.add("Tomatos"); category.add(TestsPresentationUtil.DEFAULT_TESTS_CATEGORY); - assertEquals("Running: Tests, tomatos, cucumbers 0 of <...> ", + assertEquals("Running: Cucumbers, tomatos, tests 0 of <...> ", TestsPresentationUtil.getProgressStatus_Text(0, 0, 0, 0, 0, category)); category.clear(); -- 2.11.4.GIT