Fixes sebastianbergmann#3031 - getStatus() now detects thrown Excepti…

…on inside tearDown()
rafaelbeckel · Mar 2, 2018 · 49b0b15 · 49b0b15
1 parent 3ff73dd
commit 49b0b15
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 0 deletions.
diff --git a/src/Framework/TestCase.php b/src/Framework/TestCase.php
@@ -749,6 +749,8 @@ public function runBare(): void
             $this->statusMessage = $e->getMessage();
         } catch (Throwable $_e) {
             $e = $_e;
+            $this->status        = BaseTestRunner::STATUS_ERROR;
+            $this->statusMessage = $_e->getMessage();
         }
 
         $this->mockObjects = [];

diff --git a/tests/Framework/TestCaseTest.php b/tests/Framework/TestCaseTest.php
@@ -177,6 +177,14 @@ public function testExceptionInTearDown(): void
         $this->assertTrue($test->tearDown);
         $this->assertEquals(BaseTestRunner::STATUS_ERROR, $test->getStatus());
     }
+
+    public function testExceptionInTestIsDetectedInTeardown(): void
+    {
+        $test   = new \ExceptionInTestDetectedInTeardown('testSomething');
+        $test->run();
+
+        $this->assertTrue($test->exceptionDetected);
+    }
 
     public function testNoArgTestCasePasses(): void
     {

diff --git a/tests/_files/ExceptionInTestDetectedInTeardown.php b/tests/_files/ExceptionInTestDetectedInTeardown.php
@@ -0,0 +1,21 @@
+<?php
+use PHPUnit\Framework\TestCase;
+
+use PHPUnit\Runner\BaseTestRunner;
+
+class ExceptionInTestDetectedInTeardown extends TestCase
+{
+    public $exceptionDetected = false;
+
+    public function testSomething()
+    {
+        throw new Exception;
+    }
+
+    protected function tearDown(): void
+    {
+        if (BaseTestRunner::STATUS_ERROR == $this->getStatus()) {
+            $this->exceptionDetected = true;
+        }
+    }
+}