From 950417ef02c33de80df210b5f4cbddc789cc4772 Mon Sep 17 00:00:00 2001
From: jean <Morerice>
Date: Sun, 24 Dec 2017 13:17:46 +0100
Subject: [PATCH] ref #2236 - Move status assignment after last occurence of _e
 AND add assert

---
 src/Framework/TestCase.php       | 10 +++++-----
 tests/Framework/TestCaseTest.php |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Framework/TestCase.php b/src/Framework/TestCase.php
index 237b177e7ad..988df90570f 100644
--- 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
index 2bf339a6014..a648e00e630 100644
--- 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