- Merge [5212].

sebastianbergmann · Sep 8, 2009 · 3c70bcc · 3c70bcc
1 parent 7d1535d
commit 3c70bcc
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/PHPUnit/Framework/TestCase.php b/PHPUnit/Framework/TestCase.php
@@ -714,19 +714,23 @@ public function runBare()
             $this->status = PHPUnit_Runner_BaseTestRunner::STATUS_PASSED;
         }
 
-        catch (Exception $e) {
-            if ($e instanceof PHPUnit_Framework_IncompleteTest) {
-                $this->status = PHPUnit_Runner_BaseTestRunner::STATUS_INCOMPLETE;
-            }
+        catch (PHPUnit_Framework_IncompleteTest $e) {
+            $this->status = PHPUnit_Runner_BaseTestRunner::STATUS_INCOMPLETE;
+            $this->statusMessage = $e->getMessage();
+        }
 
-            if ($e instanceof PHPUnit_Framework_SkippedTest) {
-                $this->status = PHPUnit_Runner_BaseTestRunner::STATUS_SKIPPED;
-            }
+        catch (PHPUnit_Framework_SkippedTest $e) {
+            $this->status = PHPUnit_Runner_BaseTestRunner::STATUS_SKIPPED;
+            $this->statusMessage = $e->getMessage();
+        }
 
-            if ($e instanceof PHPUnit_Framework_AssertionFailedError) {
-                $this->status = PHPUnit_Runner_BaseTestRunner::STATUS_FAILURE;
-            }
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            $this->status = PHPUnit_Runner_BaseTestRunner::STATUS_FAILURE;
+            $this->statusMessage = $e->getMessage();
+        }
 
+        catch (Exception $e) {
+            $this->status = PHPUnit_Runner_BaseTestRunner::STATUS_ERROR;
             $this->statusMessage = $e->getMessage();
         }