Enhancement: Format durations similar to phpunit/php-timer:^4.0.0

Author: localheinz

src/Formatter/DefaultDurationFormatter.php

@@ -14,6 +14,7 @@
 namespace Ergebnis\PHPUnit\SlowTestDetector\Formatter;
 
 use Ergebnis\PHPUnit\SlowTestDetector\Duration;
+use SebastianBergmann\Timer;
 
 /**
  * @internal
@@ -23,7 +24,8 @@
 final class DefaultDurationFormatter implements DurationFormatter
 {
     /**
-     * @see https://github.com/sebastianbergmann/php-timer/blob/6.0.0/src/Duration.php
+     *  @see https://github.com/sebastianbergmann/php-timer/blob/4.0.0/src/Duration.php
+     * /
      */
     public function format(Duration $duration): string
     {
@@ -40,27 +42,22 @@ public function format(Duration $duration): string
 
         $milliseconds = (int) ($durationInMilliseconds - $hoursInMilliseconds - $minutesInMilliseconds - $secondsInMilliseconds);
 
+        /**
+         * @see https://github.com/sebastianbergmann/php-timer/blob/4.0.0/src/Duration.php
+         */
         if (0 < $hours) {
             return \sprintf(
-                '%d:%02d:%02d.%03d',
+                '%02d:%02d:%02d.%03d',
                 $hours,
                 $minutes,
                 $seconds,
                 $milliseconds
             );
         }
 
-        if (0 < $minutes) {
-            return \sprintf(
-                '%d:%02d.%03d',
-                $minutes,
-                $seconds,
-                $milliseconds
-            );
-        }
-
         return \sprintf(
-            '%d.%03d',
+            '%02d:%02d.%03d',
+            $minutes,
             $seconds,
             $milliseconds
         );

test/Unit/Formatter/DefaultDurationFormatterTest.php

@@ -47,35 +47,35 @@ public static function provideDurationAndFormattedDuration(): iterable
                     0,
                     0
                 ),
-                '0.000',
+                '00:00.000',
             ],
             'milliseconds' => [
                 Duration::fromSecondsAndNanoseconds(
                     0,
                     123999000
                 ),
-                '0.123',
+                '00:00.123',
             ],
             'seconds-digits-one' => [
                 Duration::fromSecondsAndNanoseconds(
                     1,
                     234456789
                 ),
-                '1.234',
+                '00:01.234',
             ],
             'seconds-digits-two' => [
                 Duration::fromSecondsAndNanoseconds(
                     12,
                     345678912
                 ),
-                '12.345',
+                '00:12.345',
             ],
             'minutes-digits-one' => [
                 Duration::fromSecondsAndNanoseconds(
                     1 * 60 + 23,
                     456789012
                 ),
-                '1:23.456',
+                '01:23.456',
             ],
             'minutes-digits-two' => [
                 Duration::fromSecondsAndNanoseconds(
@@ -89,7 +89,7 @@ public static function provideDurationAndFormattedDuration(): iterable
                     60 * 60 + 23 * 60 + 45,
                     567890123
                 ),
-                '1:23:45.567',
+                '01:23:45.567',
             ],
             'hours-digits-two' => [
                 Duration::fromSecondsAndNanoseconds(
@@ -98,6 +98,20 @@ public static function provideDurationAndFormattedDuration(): iterable
                 ),
                 '12:34:56.789',
             ],
+            'hours-digits-two-nanoseconds-zero' => [
+                Duration::fromSecondsAndNanoseconds(
+                    12 * 60 * 60 + 34 * 60 + 56,
+                    00
+                ),
+                '12:34:56.000',
+            ],
+            'hours-digits-two-seconds-zero' => [
+                Duration::fromSecondsAndNanoseconds(
+                    12 * 60 * 60 + 34 * 60,
+                    00
+                ),
+                '12:34:00.000',
+            ],
         ];
 
         foreach ($values as $key => list($duration, $formattedDuration)) {

test/Unit/Reporter/DefaultReporterTest.php

@@ -91,7 +91,7 @@ public static function provideExpectedReportMaximumCountAndSlowTestList(): itera
                 <<<'TXT'
 Detected 1 test where the duration exceeded the maximum duration.
 
-1. 0.300 (0.100) FooTest::test
+1. 00:00.300 (00:00.100) FooTest::test
 TXT
                 ,
                 MaximumCount::fromCount(Count::fromInt(1)),
@@ -108,8 +108,8 @@ public static function provideExpectedReportMaximumCountAndSlowTestList(): itera
                 <<<'TXT'
 Detected 2 tests where the duration exceeded the maximum duration.
 
-1. 0.300 (0.100) FooTest::test
-2. 0.275 (0.100) BarTest::test
+1. 00:00.300 (00:00.100) FooTest::test
+2. 00:00.275 (00:00.100) BarTest::test
 TXT
                 ,
                 MaximumCount::fromCount(Count::fromInt(2)),
@@ -132,9 +132,9 @@ public static function provideExpectedReportMaximumCountAndSlowTestList(): itera
                 <<<'TXT'
 Detected 3 tests where the duration exceeded the maximum duration.
 
-1. 0.300 (0.100) FooTest::test
-2. 0.275 (0.100) BarTest::test
-3. 0.250 (0.100) BazTest::test
+1. 00:00.300 (00:00.100) FooTest::test
+2. 00:00.275 (00:00.100) BarTest::test
+3. 00:00.250 (00:00.100) BazTest::test
 TXT
                 ,
                 MaximumCount::fromCount(Count::fromInt(3)),
@@ -163,9 +163,9 @@ public static function provideExpectedReportMaximumCountAndSlowTestList(): itera
                 <<<'TXT'
 Detected 3 tests where the duration exceeded the maximum duration.
 
-1. 0.300 (0.100) FooTest::test
-2. 0.275 (0.100) BarTest::test
-3. 0.250 (0.100) BazTest::test
+1. 00:00.300 (00:00.100) FooTest::test
+2. 00:00.275 (00:00.100) BarTest::test
+3. 00:00.250 (00:00.100) BazTest::test
 TXT
                 ,
                 MaximumCount::fromCount(Count::fromInt(3)),
@@ -195,15 +195,15 @@ public static function provideExpectedReportMaximumCountAndSlowTestList(): itera
 Detected 10 tests where the duration exceeded the maximum duration.
 
  1. 20:50.000 (16:40.000) FooTest::test
- 2.  9:35.000 ( 8:20.000) BarTest::test
- 3.     0.250 (    0.100) BazTest::test
- 4.     0.200 (    0.100) QuxTest::test
- 5.     0.160 (    0.100) QuuxTest::test
- 6.     0.150 (    0.100) CorgeTest::test
- 7.     0.140 (    0.100) GraultTest::test
- 8.     0.130 (    0.100) GarplyTest::test
- 9.     0.120 (    0.100) WaldoTest::test
-10.     0.110 (    0.100) FredTest::test
+ 2. 09:35.000 (08:20.000) BarTest::test
+ 3. 00:00.250 (00:00.100) BazTest::test
+ 4. 00:00.200 (00:00.100) QuxTest::test
+ 5. 00:00.160 (00:00.100) QuuxTest::test
+ 6. 00:00.150 (00:00.100) CorgeTest::test
+ 7. 00:00.140 (00:00.100) GraultTest::test
+ 8. 00:00.130 (00:00.100) GarplyTest::test
+ 9. 00:00.120 (00:00.100) WaldoTest::test
+10. 00:00.110 (00:00.100) FredTest::test
 TXT
                 ,
                 MaximumCount::fromCount(Count::fromInt(10)),
@@ -274,7 +274,7 @@ public static function provideExpectedReportMaximumCountAndSlowTestList(): itera
                 <<<'TXT'
 Detected 2 tests where the duration exceeded the maximum duration.
 
-1. 0.300 (0.100) FooTest::test
+1. 00:00.300 (00:00.100) FooTest::test
 
 There is 1 additional slow test that is not listed here.
 TXT
@@ -299,7 +299,7 @@ public static function provideExpectedReportMaximumCountAndSlowTestList(): itera
                 <<<'TXT'
 Detected 3 tests where the duration exceeded the maximum duration.
 
-1. 0.300 (0.100) FooTest::test
+1. 00:00.300 (00:00.100) FooTest::test
 
 There are 2 additional slow tests that are not listed here.
 TXT