Fully separated theme from printer.

ScriptFUSION · Jul 29, 2024 · efaeaa2 · efaeaa2
1 parent 5b25d0f
commit efaeaa2
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 61 deletions.
diff --git a/src/Printer.php b/src/Printer.php
@@ -22,8 +22,6 @@
 
 final class Printer implements Tracer
 {
-    private readonly array $performanceThresholds;
-
     private int $totalTests;
 
     private int $testCounter = 0;
@@ -40,11 +38,6 @@ final class Printer implements Tracer
 
     public function __construct(private readonly PipConfig $config)
     {
-        $this->performanceThresholds = [
-            'red' => $config->perfVslow,
-            'yellow' => $config->perfSlow,
-            'green' => 0,
-        ];
     }
 
     public function trace(Event $event): void
@@ -122,19 +115,19 @@ public function trace(Event $event): void
             }
 
             $ms = round($event->telemetryInfo()->time()->duration($this->start)->asFloat() * 1_000)|0;
-            foreach ($this->performanceThresholds as $colour => $threshold) {
-                if ($ms >= $threshold) {
-                    break;
-                }
-            }
+            $performance = match (true) {
+                $ms >= $this->config->perfVslow => TestPerformance::VerySlow,
+                $ms >= $this->config->perfSlow => TestPerformance::Slow,
+                default => TestPerformance::OK,
+            };
 
             $this->config->theme->onTestFinished(new TestResult(
                 $id,
                 $this->status,
                 $this->totalTests,
                 ++$this->testCounter,
                 $ms,
-                $colour,
+                $performance,
                 $this->throwable,
                 $this->trace,
             ));

diff --git a/src/TestPerformance.php b/src/TestPerformance.php
@@ -0,0 +1,11 @@
+<?php
+declare(strict_types=1);
+
+namespace ScriptFUSION\Pip;
+
+enum TestPerformance
+{
+    case OK;
+    case Slow;
+    case VerySlow;
+}
diff --git a/src/TestResult.php b/src/TestResult.php
@@ -13,7 +13,7 @@ public function __construct(
         public readonly int $totalTests,
         public readonly int $testCounter,
         public readonly int $testDurationMs,
-        public readonly string $testDurationColour,
+        public readonly TestPerformance $testPerformance,
         public readonly ?Throwable $throwable,
         public readonly ?Trace $trace,
     ) {

diff --git a/src/TestStatus.php b/src/TestStatus.php
@@ -15,45 +15,4 @@ enum TestStatus
     case Notice;
     case Warning;
     case Deprecated;
-
-    public function getStatusCode(): string
-    {
-        return match ($this) {
-            self::Passed => '.',
-            self::Flawed => '!',
-            self::Failed => 'F',
-            self::Errored => 'E',
-            self::Skipped => 'S',
-            self::Incomplete => 'I',
-            self::Risky => 'R',
-            self::Notice => 'N',
-            self::Warning => 'W',
-            self::Deprecated => 'D',
-        };
-    }
-
-    public function getStatusColour(): string
-    {
-        return match ($this) {
-            self::Passed => '',
-            self::Flawed => 'red',
-            default => $this->getColour(),
-        };
-    }
-
-    public function getColour(): string
-    {
-        return match ($this) {
-            self::Passed,
-            self::Flawed => 'green,bold',
-            self::Failed,
-            self::Errored => 'red,bold',
-            self::Skipped => 'cyan,bold',
-            self::Incomplete,
-            self::Risky,
-            self::Notice,
-            self::Warning,
-            self::Deprecated, => 'yellow,bold',
-        };
-    }
 }
diff --git a/src/Theme/ClassicTheme.php b/src/Theme/ClassicTheme.php
@@ -4,6 +4,7 @@
 namespace ScriptFUSION\Pip\Theme;
 
 use PHPUnit\Util\Color;
+use ScriptFUSION\Pip\TestPerformance;
 use ScriptFUSION\Pip\TestResult;
 use ScriptFUSION\Pip\TestStatus;
 
@@ -14,11 +15,14 @@ public function onTestFinished(TestResult $result): void
         printf(
             "%3d%% %s %s %s%s",
             $result->calculateProgressPercentage(),
-            $result->status->getStatusColour() === ''
-                ? $result->status->getStatusCode()
-                : Color::colorize("fg-{$result->status->getStatusColour()}", $result->status->getStatusCode()),
-            Color::colorize("fg-{$result->status->getColour()}", $result->id),
-            Color::colorize("fg-$result->testDurationColour", "($result->testDurationMs ms)"),
+            ($statusColour = self::getStatusColour($result->status)) === ''
+                ? self::getStatusCode($result->status)
+                : Color::colorize("fg-$statusColour", self::getStatusCode($result->status)),
+            Color::colorize("fg-" . self::getColour($result->status), $result->id),
+            Color::colorize(
+                'fg-' . self::getPeformanceColour($result->testPerformance),
+                "($result->testDurationMs ms)"
+            ),
             PHP_EOL,
         );
 
@@ -44,7 +48,7 @@ public function onTestFinished(TestResult $result): void
 
         if ($result->trace) {
             printf(
-                Color::colorize("fg-{$result->status->getColour()}", '%s%s: %s in %s on line %s%1$s%1$s'),
+                Color::colorize("fg-$statusColour", '%s%s: %s in %s on line %s%1$s%1$s'),
                 PHP_EOL,
                 $result->status->name,
                 $result->trace->message,
@@ -53,4 +57,47 @@ public function onTestFinished(TestResult $result): void
             );
         }
     }
+
+    private static function getStatusCode(TestStatus $status): string
+    {
+        return match ($status) {
+            TestStatus::Passed => '.',
+            TestStatus::Flawed => '!',
+            default => $status->name[0],
+        };
+    }
+
+    private static function getStatusColour(TestStatus $status): string
+    {
+        return match ($status) {
+            TestStatus::Passed => '',
+            TestStatus::Flawed => 'red',
+            default => self::getColour($status),
+        };
+    }
+
+    private static function getColour(TestStatus $status): string
+    {
+        return match ($status) {
+            TestStatus::Passed,
+            TestStatus::Flawed => 'green,bold',
+            TestStatus::Failed,
+            TestStatus::Errored => 'red,bold',
+            TestStatus::Skipped => 'cyan,bold',
+            TestStatus::Incomplete,
+            TestStatus::Risky,
+            TestStatus::Notice,
+            TestStatus::Warning,
+            TestStatus::Deprecated, => 'yellow,bold',
+        };
+    }
+
+    private static function getPeformanceColour(TestPerformance $performance): string
+    {
+        return match ($performance) {
+            TestPerformance::OK => 'green',
+            TestPerformance::Slow => 'yellow',
+            TestPerformance::VerySlow => 'red',
+        };
+    }
 }