SONARPLUGINS-1023 Don't show leading zeros, so format of "total time" is fully consis...

diff --git a/src/main/java/org/sonar/runner/Main.java b/src/main/java/org/sonar/runner/Main.java
index f13138d527df26fee10a72cc45e18b6d55e36454..3de89f2209c0dd510b7aeb0140d4a85a15534c32 100644 (file)
--- a/src/main/java/org/sonar/runner/Main.java
+++ b/src/main/java/org/sonar/runner/Main.java
@@ -76,7 +76,15 @@ public final class Main {
     long m = (time - h * 60 * 60 * 1000) / (60 * 1000);
     long s = (time - h * 60 * 60 * 1000 - m * 60 * 1000) / 1000;
     long ms = time % 1000;
-    return String.format("%1$d:%2$02d:%3$02d.%4$03ds", h, m, s, ms);
+    final String format;
+    if (h > 0) {
+      format = "%1$d:%2$02d:%3$02d.%4$03ds";
+    } else if (m > 0) {
+      format = "%2$d:%3$02d.%4$03ds";
+    } else {
+      format = "%3$d.%4$03ds";
+    }
+    return String.format(format, h, m, s, ms);
   }
 
   static Properties loadProperties(String[] args) {

diff --git a/src/test/java/org/sonar/runner/MainTest.java b/src/test/java/org/sonar/runner/MainTest.java
index 5a06c45df9109aa14767a493c14f11ff9e187df2..ab324cbd40432b816e759249801782c39851a483 100644 (file)
--- a/src/test/java/org/sonar/runner/MainTest.java
+++ b/src/test/java/org/sonar/runner/MainTest.java
@@ -104,8 +104,8 @@ public class MainTest {
   @Test
   public void shouldFormatTime() {
     assertThat(Main.formatTime(1 * 60 * 60 * 1000 + 2 * 60 * 1000 + 3 * 1000 + 400), is("1:02:03.400s"));
-    assertThat(Main.formatTime(2 * 60 * 1000 + 3 * 1000 + 400), is("0:02:03.400s"));
-    assertThat(Main.formatTime(3 * 1000 + 400), is("0:00:03.400s"));
-    assertThat(Main.formatTime(400), is("0:00:00.400s"));
+    assertThat(Main.formatTime(2 * 60 * 1000 + 3 * 1000 + 400), is("2:03.400s"));
+    assertThat(Main.formatTime(3 * 1000 + 400), is("3.400s"));
+    assertThat(Main.formatTime(400), is("0.400s"));
   }
 }