ref #2236 - Move status assignment after last occurence of _e AND add…

… assert
sebastianbergmann · Dec 28, 2017 · 950417e · 950417e
1 parent c728a76
commit 950417e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/Framework/TestCase.php b/src/Framework/TestCase.php
@@ -925,11 +925,6 @@ public function runBare(): void
             $e = $_e;
         }
 
-        if (isset($_e)) {
-            $this->status        = BaseTestRunner::STATUS_ERROR;
-            $this->statusMessage = $_e->getMessage();
-        }
-
         // Clean up the mock objects.
         $this->mockObjects = [];
         $this->prophet     = null;
@@ -962,6 +957,11 @@ public function runBare(): void
             }
         }
 
+        if (isset($_e)) {
+            $this->status        = BaseTestRunner::STATUS_ERROR;
+            $this->statusMessage = $_e->getMessage();
+        }
+
         \clearstatcache();
 
         if ($currentWorkingDirectory != \getcwd()) {

diff --git a/tests/Framework/TestCaseTest.php b/tests/Framework/TestCaseTest.php
@@ -175,6 +175,7 @@ public function testExceptionInTearDown(): void
         $this->assertTrue($test->testSomething);
         $this->assertTrue($test->assertPostConditions);
         $this->assertTrue($test->tearDown);
+        $this->assertEquals(BaseTestRunner::STATUS_ERROR, $test->getStatus());
     }
 
     public function testNoArgTestCasePasses(): void