From 77c46d3ddb2913facd65bda2b7a25f73c8c05822 Mon Sep 17 00:00:00 2001 From: Roman Chernyatchik Date: Mon, 24 Nov 2008 20:09:16 +0300 Subject: [PATCH] Fixed [RUBY-2360] : Test stats output --- .../ruby/testing/sm/runner/ui/statistics/ColumnTest.java | 11 +++++++---- .../ruby/testing/sm/runner/ui/statistics/ColumnTestTest.java | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/plugins/ruby/src/org/jetbrains/plugins/ruby/testing/sm/runner/ui/statistics/ColumnTest.java b/plugins/ruby/src/org/jetbrains/plugins/ruby/testing/sm/runner/ui/statistics/ColumnTest.java index 83f9aadbb4..4adfa889d6 100644 --- a/plugins/ruby/src/org/jetbrains/plugins/ruby/testing/sm/runner/ui/statistics/ColumnTest.java +++ b/plugins/ruby/src/org/jetbrains/plugins/ruby/testing/sm/runner/ui/statistics/ColumnTest.java @@ -40,8 +40,8 @@ public class ColumnTest extends BaseColumn implements Comparator{ } public static class TestsCellRenderer extends ColoredTableCellRenderer implements ColoredRenderer { - @NonNls private static final String TOTAL_TITLE = RBundle.message( - "sm.test.runner.ui.tabs.statistics.columns.test.total.title"); + @NonNls private static final String TOTAL_TITLE = RBundle.message("sm.test.runner.ui.tabs.statistics.columns.test.total.title"); + @NonNls private static final String PARENT_TITLE = ".."; private final SMTestProxy myProxy; @@ -60,8 +60,11 @@ public class ColumnTest extends BaseColumn implements Comparator{ final String title = value.toString(); //Black bold for with caption "Total" for parent suite of items in statistics if (myProxy.isSuite() && isFirstLine(row)) { - append(TOTAL_TITLE, SimpleTextAttributes.REGULAR_BOLD_ATTRIBUTES); - if (myProxy.getParent() != null) { + if (myProxy.getParent() == null) { + append(TOTAL_TITLE, SimpleTextAttributes.REGULAR_BOLD_ATTRIBUTES); + } + else { + append(PARENT_TITLE, SimpleTextAttributes.REGULAR_BOLD_ATTRIBUTES); append(" (" + myProxy.getName() + ")", SimpleTextAttributes.GRAYED_ATTRIBUTES); } return; diff --git a/plugins/ruby/testSrc/org/jetbrains/plugins/ruby/testing/sm/runner/ui/statistics/ColumnTestTest.java b/plugins/ruby/testSrc/org/jetbrains/plugins/ruby/testing/sm/runner/ui/statistics/ColumnTestTest.java index 85e981a05a..a2e27a6d39 100644 --- a/plugins/ruby/testSrc/org/jetbrains/plugins/ruby/testing/sm/runner/ui/statistics/ColumnTestTest.java +++ b/plugins/ruby/testSrc/org/jetbrains/plugins/ruby/testing/sm/runner/ui/statistics/ColumnTestTest.java @@ -77,7 +77,7 @@ public class ColumnTestTest extends BaseColumnRenderingTest { doRender(mySuite, 0); assertFragmentsSize(2); assertEquals(SimpleTextAttributes.REGULAR_BOLD_ATTRIBUTES, myFragmentsContainer.getAttribsAt(0)); - assertEquals("Total:", myFragmentsContainer.getTextAt(0)); + assertEquals("..", myFragmentsContainer.getTextAt(0)); assertEquals(SimpleTextAttributes.GRAYED_ATTRIBUTES, myFragmentsContainer.getAttribsAt(1)); assertEquals(" (suite)", myFragmentsContainer.getTextAt(1)); } -- 2.11.4.GIT