SONAR-7354 Display total analysis time in scanners

diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/GlobalContainer.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/GlobalContainer.java
index 23d6208c881e38b697d72a5f78383032f51b46d0..605a067c66f0037ee24f202d578a86b2c0b7a423 100644 (file)
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/GlobalContainer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/GlobalContainer.java
@@ -121,11 +121,11 @@ public class GlobalContainer extends ComponentContainer {
     long ms = time % 1000;
     final String format;
     if (h > 0) {
-      format = "%1$d:%2$02d:%3$02d.%4$03ds";
+      format = "%1$d:%2$02d:%3$02d.%4$03d s";
     } else if (m > 0) {
-      format = "%2$d:%3$02d.%4$03ds";
+      format = "%2$d:%3$02d.%4$03d s";
     } else {
-      format = "%3$d.%4$03ds";
+      format = "%3$d.%4$03d s";
     }
     return String.format(format, h, m, s, ms);
   }

diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/GlobalContainerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/GlobalContainerTest.java
index 9143af92249de46d10766fb5d954144c3c0eb01b..d94ed4df80a6bdf3add48f2f1a585c5b07bd4b35 100644 (file)
--- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/GlobalContainerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/GlobalContainerTest.java
@@ -66,10 +66,10 @@ public class GlobalContainerTest {
 
   @Test
   public void shouldFormatTime() {
-    assertThat(GlobalContainer.formatTime(1 * 60 * 60 * 1000 + 2 * 60 * 1000 + 3 * 1000 + 400)).isEqualTo("1:02:03.400s");
-    assertThat(GlobalContainer.formatTime(2 * 60 * 1000 + 3 * 1000 + 400)).isEqualTo("2:03.400s");
-    assertThat(GlobalContainer.formatTime(3 * 1000 + 400)).isEqualTo("3.400s");
-    assertThat(GlobalContainer.formatTime(400)).isEqualTo("0.400s");
+    assertThat(GlobalContainer.formatTime(1 * 60 * 60 * 1000 + 2 * 60 * 1000 + 3 * 1000 + 400)).isEqualTo("1:02:03.400 s");
+    assertThat(GlobalContainer.formatTime(2 * 60 * 1000 + 3 * 1000 + 400)).isEqualTo("2:03.400 s");
+    assertThat(GlobalContainer.formatTime(3 * 1000 + 400)).isEqualTo("3.400 s");
+    assertThat(GlobalContainer.formatTime(400)).isEqualTo("0.400 s");
   }
 
   @BatchSide