Unwrap exception

Author: sebastianbergmann

src/Util/Log/JUnit.php

@@ -127,21 +127,26 @@ public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
         }
 
         if ($test instanceof PHPUnit_Framework_SelfDescribing) {
-            $buffer = $test->toString() . "\n";
+            $buffer = $test->toString() . PHP_EOL;
         } else {
             $buffer = '';
         }
 
-        $buffer .= PHPUnit_Framework_TestFailure::exceptionToString($e) .
-                   "\n" .
-                   PHPUnit_Util_Filter::getFilteredStacktrace($e);
+        if ($e instanceof PHPUnit_Framework_ExceptionWrapper) {
+            $type    = $e->getClassname();
+            $buffer .= (string) $e;
+        } else {
+            $type    = get_class($e);
+            $buffer .= PHPUnit_Framework_TestFailure::exceptionToString($e) . PHP_EOL .
+                       PHPUnit_Util_Filter::getFilteredStacktrace($e);
+        }
 
         $error = $this->document->createElement(
             'error',
             PHPUnit_Util_XML::prepareString($buffer)
         );
 
-        $error->setAttribute('type', get_class($e));
+        $error->setAttribute('type', $type);
 
         $this->currentTestCase->appendChild($error);
 

tests/TextUI/log-junit.phpt

@@ -26,7 +26,7 @@ Failed asserting that false is true.
 </failure>
     </testcase>
     <testcase name="testError" class="StatusTest" file="%s/StatusTest.php" line="%d" assertions="0" time="%s">
-      <error type="PHPUnit_Framework_ExceptionWrapper">StatusTest::testError
+      <error type="Exception">StatusTest::testError
 Exception: 
 
 %s/StatusTest.php:%d