From 03e604991acb8c8462a4aaba4757aa866bf68f7e Mon Sep 17 00:00:00 2001 From: "Anna.Kozlova" Date: Fri, 27 Oct 2017 19:50:42 +0200 Subject: [PATCH] format balloon text to meet UI mockup --- .../src/messages/ExecutionBundle.properties | 2 +- .../com/intellij/execution/testframework/TestsUIUtil.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/platform/platform-resources-en/src/messages/ExecutionBundle.properties b/platform/platform-resources-en/src/messages/ExecutionBundle.properties index 78a0598e951f..07b187916fa5 100644 --- a/platform/platform-resources-en/src/messages/ExecutionBundle.properties +++ b/platform/platform-resources-en/src/messages/ExecutionBundle.properties @@ -145,7 +145,7 @@ junit.runing.info.ignored.count.message=I:{0} junit.running.info.status.completed.from.total.failed={0} of {1} Failed: {2} junit.running.info.status.completed.from.total={0} of {1} junit.running.info.status.running.number.with.name=Running: {0} {1} -junit.running.info.failed.to.start.error.message=Failed to start +junit.running.info.failed.to.start.error.message=Failed to Start junit.runing.info.tests.failed.label=Tests Failed junit.runing.info.tests.passed.label=Tests Passed tests.passed.with.warnings.message=Tests passed (with warnings) diff --git a/platform/testRunner/src/com/intellij/execution/testframework/TestsUIUtil.java b/platform/testRunner/src/com/intellij/execution/testframework/TestsUIUtil.java index ef7e10419fc6..f1ba3bce07dc 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/TestsUIUtil.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/TestsUIUtil.java @@ -238,28 +238,32 @@ public class TestsUIUtil { myTitle = ExecutionBundle.message("junit.runing.info.tests.failed.label"); String notStartedMessage = ignoredCount > 0 ? ", " + ignoredCount + " ignored" : notStartedCount > 0 ? ", " + notStartedCount + " not started" : ""; + myBalloonText = "Tests failed: " + failedCount + ", passed: " + passedCount + + (ignoredCount > 0 ? ", ignored: " + ignoredCount : notStartedCount > 0 ? ", not started: " + notStartedCount : ""); myText = passedCount + " passed, " + failedCount + " failed" + notStartedMessage; myType = MessageType.ERROR; } else if (ignoredCount > 0) { myTitle = "Tests Ignored"; + myBalloonText = "Tests ignored: " + ignoredCount + ", passed: " + passedCount; myText = passedCount + " passed, " + ignoredCount + " ignored"; myType = MessageType.WARNING; } else if (notStartedCount > 0) { myTitle = ExecutionBundle.message("junit.running.info.failed.to.start.error.message"); + myBalloonText = "Failed to start: " + notStartedCount + ", passed: " + passedCount; myText = passedCount + " passed, " + notStartedCount + " not started"; myType = MessageType.ERROR; } else { myTitle = ExecutionBundle.message("junit.runing.info.tests.passed.label"); + myBalloonText = "Tests passed: " + passedCount; myText = passedCount + " passed"; myType = MessageType.INFO; } if (myComment != null) { myText += " " + myComment; } - myBalloonText = myTitle + ": " + myText; } return this; }