Changed success progress indicator ('.') to be red after an error or …

…failure occurs.
ScriptFUSION · Jul 25, 2017 · 0543bf4 · 0543bf4
1 parent 5bd117e
commit 0543bf4
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 6 deletions.
diff --git a/src/Printer.php b/src/Printer.php
@@ -27,6 +27,13 @@ trait Printer
      */
     protected $lastColour;
 
+    /**
+     * Indicates whether any errors or exceptions have occurred during the entire test run.
+     *
+     * @var bool
+     */
+    protected $flawless = true;
+
     private static $performanceThresholds = [
         'fg-red' => 1000,
         'fg-yellow' => 200,
@@ -50,7 +57,7 @@ protected function onStartTest()
     protected function writeProgress($progress)
     {
         // Record progress so it can be written later instead of at start of line.
-        $this->progress = $progress;
+        $this->progress = $this->flawless ? $progress : $this->formatWithColor('fg-red', $progress);
 
         ++$this->numTestsRun;
     }
@@ -157,6 +164,7 @@ protected function onAddError(\Exception $e)
 
         $this->exception = $e;
         $this->lastTestFailed = true;
+        $this->flawless = false;
     }
 
     /**
@@ -170,5 +178,6 @@ protected function onAddFailure($e)
 
         $this->exception = $e;
         $this->lastTestFailed = true;
+        $this->flawless = false;
     }
 }
diff --git a/test/CapabilitiesTest.php b/test/CapabilitiesTest.php
@@ -59,4 +59,19 @@ public function provideData()
             'baz' => ['qux'],
         ];
     }
+
+    /**
+     * @dataProvider provideSuccessesAndFailures
+     */
+    public function testSuccessAfterFailure($bool)
+    {
+        self::assertTrue($bool);
+    }
+
+    public function provideSuccessesAndFailures()
+    {
+        for ($i = 0; $i < 4; ++$i) {
+            yield [$i !== 1];
+        }
+    }
 }
diff --git a/test/functional/diff failure.phpt b/test/functional/diff failure.phpt
@@ -16,8 +16,8 @@ PHPUnit %s
 [31m--- Expected[0m
 [31m+++ Actual[0m
 [31m@@ @@[0m
-[31m-foo[0m
-[31m+LogicException: foo[0m
+[31m-%Sfoo%S[0m
+[31m+%SLogicException: foo%S[0m
 [31m[0m
 [31m%s%eCapabilitiesTest.php:%i[0m
 [31m[0m
@@ -32,8 +32,8 @@ Failed asserting that two strings are identical.
 --- Expected
 +++ Actual
 @@ @@
--foo
-+LogicException: foo
+-%Sfoo%S
++%SLogicException: foo%S
 
 %s%eCapabilitiesTest.php:%i
 

diff --git a/test/functional/risky.phpt b/test/functional/risky.phpt
@@ -14,6 +14,6 @@ PHPUnit %s
 
 
 Time: %s
-
+%A
 [30;43mOK, but incomplete, skipped, or risky tests![0m
 [30;43mTests: 1[0m[30;43m, Assertions: 0[0m[30;43m, Risky: 1[0m[30;43m.[0m
diff --git a/test/functional/success after failure.phpt b/test/functional/success after failure.phpt
@@ -0,0 +1,34 @@
+--TEST--
+Successful tests following a failure have coloured progress marker.
+
+--ARGS--
+-c test --colors=always test/CapabilitiesTest --filter '::testSuccessAfterFailure\h'
+
+--FILE_EXTERNAL--
+PHPUnit runner.php
+
+--EXPECTF--
+PHPUnit %s
+
+ 25% . [32;1mScriptFUSIONTest\PHPUnitImmediateExceptionPrinter\CapabilitiesTest::testSuccessAfterFailure with data set #0 (true)[0m[32m (%i ms)[0m
+ 50% [31;1mF[0m [31;1mScriptFUSIONTest\PHPUnitImmediateExceptionPrinter\CapabilitiesTest::testSuccessAfterFailure with data set #1 (false)[0m[32m (%i ms)[0m
+
+[31mFailed asserting that false is true.[0m
+[31m[0m
+[31m%s%eCapabilitiesTest.php:%i[0m
+[31m[0m
+ 75% [31m.[0m [32;1mScriptFUSIONTest\PHPUnitImmediateExceptionPrinter\CapabilitiesTest::testSuccessAfterFailure with data set #2 (true)[0m[32m (%i ms)[0m
+100% [31m.[0m [32;1mScriptFUSIONTest\PHPUnitImmediateExceptionPrinter\CapabilitiesTest::testSuccessAfterFailure with data set #3 (true)[0m[32m (%i ms)[0m
+
+
+Time: %s
+
+There was 1 failure:
+
+1) ScriptFUSIONTest\PHPUnitImmediateExceptionPrinter\CapabilitiesTest::testSuccessAfterFailure with data set #1 (false)
+Failed asserting that false is true.
+
+%s%eCapabilitiesTest.php:%i
+
+[37;41mFAILURES![0m
+[37;41mTests: 4[0m[37;41m, Assertions: 4[0m[37;41m, Failures: 1[0m[37;41m.[0m