MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

String.formatDuration instead of custom one

Browse Source
This commit is contained in:
Anna Kozlova
2015-05-07 18:16:18 +02:00
parent d98fa23401
commit 2e5898df6d
5 changed files with 25 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/TestsPresentationUtil.java
+2 -47
View File
@@ -15,7 +15,6 @@
*/
package com.intellij.execution.testframework.sm.runner.ui;
import com.intellij.execution.ExecutionBundle;
import com.intellij.execution.process.AnsiEscapeDecoder;
import com.intellij.execution.process.ProcessOutputTypes;
import com.intellij.execution.testframework.PoolOfTestIcons;
@@ -38,7 +37,6 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.*;
import java.text.NumberFormat;
import java.util.List;
import java.util.Set;
@@ -49,9 +47,6 @@ import static com.intellij.execution.testframework.sm.runner.ui.SMPoolOfTestIcon
*/
public class TestsPresentationUtil {
@NonNls private static final String DOUBLE_SPACE = " ";
@NonNls private static final String SECONDS_SUFFIX = " " + SMTestsRunnerBundle.message("sm.test.runner.ui.tests.tree.presentation.labels.seconds");
@NonNls private static final String MILLISECONDS_SUFFIX = " " + SMTestsRunnerBundle.message("sm.test.runner.ui.tests.tree.presentation.labels.milliseconds");
@NonNls private static final String WORLD_CREATION_TIME = "0" + SECONDS_SUFFIX;
@NonNls private static final String DURATION_UNKNOWN = SMTestsRunnerBundle.message(
"sm.test.runner.ui.tabs.statistics.columns.duration.unknown");
@NonNls private static final String DURATION_NO_TESTS = SMTestsRunnerBundle.message(
@@ -133,7 +128,7 @@ public class TestsPresentationUtil {
if (endTime != 0) {
final long time = endTime - startTime;
sb.append(DOUBLE_SPACE);
sb.append('(').append(convertToSecondsOrMs(time)).append(')');
sb.append('(').append(StringUtil.formatDuration(time)).append(')');
}
sb.append(DOUBLE_SPACE);
@@ -415,21 +410,7 @@ public class TestsPresentationUtil {
? DURATION_NO_TESTS
: DURATION_UNKNOWN;
} else {
return convertToSecondsOrMs(duration.longValue());
}
}
/**
* @param duration In milliseconds
* @return Value in seconds or millisecond depending on its value
*/
private static String convertToSecondsOrMs(@NotNull final Long duration) {
if (duration == 0) {
return WORLD_CREATION_TIME;
} else if (duration < 100) {
return String.valueOf(duration) + MILLISECONDS_SUFFIX;
} else {
return printTime(duration);
return StringUtil.formatDuration(duration.longValue());
}
}
@@ -476,30 +457,4 @@ public class TestsPresentationUtil {
}
});
}
public static String printTime(final long milliseconds) {
if (milliseconds == 0) {
return ExecutionBundle.message("junit.runing.info.time.sec.message", "0.0");
}
long seconds = milliseconds / 1000;
if (seconds == 0) {
return ExecutionBundle.message("junit.runing.info.time.sec.message", NumberFormat.getInstance().format((double)milliseconds/1000.0));
}
final StringBuilder sb = new StringBuilder();
if (seconds >= 3600) {
sb.append(seconds / 3600).append(" h ");
seconds %= 3600;
}
if (seconds >= 60) {
sb.append(seconds / 60).append(" m ");
seconds %= 60;
}
if (seconds > 0 || sb.length() > 0) {
sb.append(seconds).append(" s");
}
return sb.toString();
}
}
platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/ui/TestsPresentationUtilTest.java
+2 -2
View File
@@ -60,7 +60,7 @@ public class TestsPresentationUtilTest extends BaseSMTRunnerTestCase {
assertEquals("Running: 10 of 1 ",
TestsPresentationUtil.getProgressStatus_Text(0, 0, 1, 10, 0, null, true));
//here number format is platform-dependent
assertEquals("Done: 10 of 1 (0 s) ",
assertEquals("Done: 10 of 1 (0ms) ",
TestsPresentationUtil.getProgressStatus_Text(5, 5, 1, 10, 0, null, false));
}
@@ -74,7 +74,7 @@ public class TestsPresentationUtilTest extends BaseSMTRunnerTestCase {
assertEquals("Running: 10 of <...> Failed: 1 ",
TestsPresentationUtil.getProgressStatus_Text(0, 0, 0, 10, 1, null, false));
//here number format is platform-dependent
assertEquals("Done: 10 of <...> Failed: 1 (5 ms) ",
assertEquals("Done: 10 of <...> Failed: 1 (5ms) ",
TestsPresentationUtil.getProgressStatus_Text(0, 5, 0, 10, 1, null, false));
}
platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/ui/statistics/ColumnDurationTest.java
+17 -17
View File
@@ -41,7 +41,7 @@ public class ColumnDurationTest extends BaseColumnRenderingTest {
assertEquals("<UNKNOWN>", myColumn.valueOf(mySimpleTest));
mySimpleTest.setDuration(10000);
assertEquals("10 s", myColumn.valueOf(mySimpleTest));
assertEquals("10s", myColumn.valueOf(mySimpleTest));
}
public void testValueOf_TestPassed() {
@@ -50,7 +50,7 @@ public class ColumnDurationTest extends BaseColumnRenderingTest {
assertEquals("<UNKNOWN>", myColumn.valueOf(mySimpleTest));
mySimpleTest.setDuration(10000);
assertEquals("10 s", myColumn.valueOf(mySimpleTest));
assertEquals("10s", myColumn.valueOf(mySimpleTest));
}
public void testValueOf_TestError() {
@@ -59,7 +59,7 @@ public class ColumnDurationTest extends BaseColumnRenderingTest {
assertEquals("<UNKNOWN>", myColumn.valueOf(mySimpleTest));
mySimpleTest.setDuration(10000);
assertEquals("10 s", myColumn.valueOf(mySimpleTest));
assertEquals("10s", myColumn.valueOf(mySimpleTest));
}
public void testValueOf_TestTerminated() {
@@ -68,7 +68,7 @@ public class ColumnDurationTest extends BaseColumnRenderingTest {
assertEquals("<TERMINATED>", myColumn.valueOf(mySimpleTest));
mySimpleTest.setDuration(10000);
assertEquals("TERMINATED: 10 s", myColumn.valueOf(mySimpleTest));
assertEquals("TERMINATED: 10s", myColumn.valueOf(mySimpleTest));
}
public void testValueOf_TestIgnored() {
@@ -78,7 +78,7 @@ public class ColumnDurationTest extends BaseColumnRenderingTest {
assertEquals("<UNKNOWN>", myColumn.valueOf(mySimpleTest));
mySimpleTest.setDuration(10000);
assertEquals("10 s", myColumn.valueOf(mySimpleTest));
assertEquals("10s", myColumn.valueOf(mySimpleTest));
}
public void testValueOf_Duration_Zero() {
@@ -87,7 +87,7 @@ public class ColumnDurationTest extends BaseColumnRenderingTest {
assertEquals("<UNKNOWN>", myColumn.valueOf(mySimpleTest));
mySimpleTest.setDuration(0);
assertEquals("0 s", myColumn.valueOf(mySimpleTest));
assertEquals("0ms", myColumn.valueOf(mySimpleTest));
}
public void testValueOf_Duration_1() {
@@ -96,7 +96,7 @@ public class ColumnDurationTest extends BaseColumnRenderingTest {
assertEquals("<UNKNOWN>", myColumn.valueOf(mySimpleTest));
mySimpleTest.setDuration(1);
assertEquals("1 ms", myColumn.valueOf(mySimpleTest));
assertEquals("1ms", myColumn.valueOf(mySimpleTest));
}
public void testValueOf_Duration_99() {
@@ -105,7 +105,7 @@ public class ColumnDurationTest extends BaseColumnRenderingTest {
assertEquals("<UNKNOWN>", myColumn.valueOf(mySimpleTest));
mySimpleTest.setDuration(99);
assertEquals("99 ms", myColumn.valueOf(mySimpleTest));
assertEquals("99ms", myColumn.valueOf(mySimpleTest));
}
public void testValueOf_Duration_100() {
@@ -114,7 +114,7 @@ public class ColumnDurationTest extends BaseColumnRenderingTest {
assertEquals("<UNKNOWN>", myColumn.valueOf(mySimpleTest));
mySimpleTest.setDuration(100);
assertEquals(String.valueOf((float)0.1) + " s", myColumn.valueOf(mySimpleTest));
assertEquals("100ms", myColumn.valueOf(mySimpleTest));
}
public void testValueOf_Duration_999() {
@@ -123,7 +123,7 @@ public class ColumnDurationTest extends BaseColumnRenderingTest {
assertEquals("<UNKNOWN>", myColumn.valueOf(mySimpleTest));
mySimpleTest.setDuration(999);
assertEquals(String.valueOf((float)0.999) + " s", myColumn.valueOf(mySimpleTest));
assertEquals("999ms", myColumn.valueOf(mySimpleTest));
}
public void testValueOf_Duration_1000() {
@@ -132,7 +132,7 @@ public class ColumnDurationTest extends BaseColumnRenderingTest {
assertEquals("<UNKNOWN>", myColumn.valueOf(mySimpleTest));
mySimpleTest.setDuration(1000);
assertEquals("1 s", myColumn.valueOf(mySimpleTest));
assertEquals("1s", myColumn.valueOf(mySimpleTest));
}
public void testValueOf_Duration_1001() {
@@ -141,7 +141,7 @@ public class ColumnDurationTest extends BaseColumnRenderingTest {
assertEquals("<UNKNOWN>", myColumn.valueOf(mySimpleTest));
mySimpleTest.setDuration(1001);
assertEquals("1 s", myColumn.valueOf(mySimpleTest));
assertEquals("1s 1ms", myColumn.valueOf(mySimpleTest));
}
public void testValueOf_SuiteEmpty() {
@@ -176,7 +176,7 @@ public class ColumnDurationTest extends BaseColumnRenderingTest {
assertEquals("<UNKNOWN>", myColumn.valueOf(suite));
test.setDuration(10000);
assertEquals("10 s", myColumn.valueOf(suite));
assertEquals("10s", myColumn.valueOf(suite));
}
public void testValueOf_SuiteError() {
@@ -190,7 +190,7 @@ public class ColumnDurationTest extends BaseColumnRenderingTest {
assertEquals("<UNKNOWN>", myColumn.valueOf(suite));
test.setDuration(10000);
assertEquals("10 s", myColumn.valueOf(suite));
assertEquals("10s", myColumn.valueOf(suite));
}
public void testValueOf_SuitePassed() {
@@ -204,7 +204,7 @@ public class ColumnDurationTest extends BaseColumnRenderingTest {
assertEquals("<UNKNOWN>", myColumn.valueOf(suite));
test.setDuration(10000);
assertEquals("10 s", myColumn.valueOf(suite));
assertEquals("10s", myColumn.valueOf(suite));
}
public void testValueOf_SuiteTerminated() {
@@ -217,7 +217,7 @@ public class ColumnDurationTest extends BaseColumnRenderingTest {
assertEquals("<TERMINATED>", myColumn.valueOf(suite));
test.setDuration(10000);
assertEquals("TERMINATED: 10 s", myColumn.valueOf(suite));
assertEquals("TERMINATED: 10s", myColumn.valueOf(suite));
}
public void testValueOf_SuiteRunning() {
@@ -230,7 +230,7 @@ public class ColumnDurationTest extends BaseColumnRenderingTest {
assertEquals("<RUNNING>", myColumn.valueOf(suite));
test.setDuration(10000);
assertEquals("RUNNING: 10 s", myColumn.valueOf(suite));
assertEquals("RUNNING: 10s", myColumn.valueOf(suite));
}
public void testTotal_Test() {
plugins/junit/src/com/intellij/execution/junit2/ui/ActualStatistics.java
+2 -2
View File
@@ -18,7 +18,7 @@ package com.intellij.execution.junit2.ui;
import com.intellij.execution.junit2.states.CumulativeStatistics;
import com.intellij.execution.junit2.states.Statistics;
import com.intellij.execution.testframework.sm.runner.ui.TestsPresentationUtil;
import com.intellij.openapi.util.text.StringUtil;
class ActualStatistics implements TestStatistics {
private final CumulativeStatistics myStatistics = new CumulativeStatistics();
@@ -33,7 +33,7 @@ class ActualStatistics implements TestStatistics {
}
public String getTime() {
return myPrefix + TestsPresentationUtil.printTime(myStatistics.getTime());
return myPrefix + StringUtil.formatDuration(myStatistics.getTime());
}
public String getMemoryUsageDelta() {
plugins/junit/src/com/intellij/execution/junit2/ui/model/CompletionEvent.java
+2 -2
View File
@@ -16,14 +16,14 @@
package com.intellij.execution.junit2.ui.model;
import com.intellij.execution.testframework.sm.runner.ui.TestsPresentationUtil;
import com.intellij.openapi.util.text.StringUtil;
public class CompletionEvent extends StateEvent {
private final boolean myNormalExit;
public CompletionEvent(final boolean normalExit, final long time) {
super(normalExit ? TerminatedType.DONE: TerminatedType.TERNINATED,
time >= 0 ? "in " + TestsPresentationUtil.printTime(time) : "");
time >= 0 ? "in " + StringUtil.formatDuration(time) : "");
myNormalExit = normalExit;
}