- Merge [4657].

sebastianbergmann · Feb 21, 2009 · 528860d · 528860d
1 parent 64fbd32
commit 528860d
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/PHPUnit/Util/TestDox/ResultPrinter.php b/PHPUnit/Util/TestDox/ResultPrinter.php
@@ -230,8 +230,15 @@ public function startTest(PHPUnit_Framework_Test $test)
                 $this->tests     = array();
             }
 
-            $this->currentTestMethodPrettified = $this->prettifier->prettifyTestMethod($test->getName());
+            $annotations = $test->getAnnotations();
-            $this->testStatus                  = PHPUnit_Runner_BaseTestRunner::STATUS_PASSED;
+
+            if (isset($annotations['method']['testdox'][0])) {
+                $this->currentTestMethodPrettified = $annotations['method']['testdox'][0];
+            } else {
+                $this->currentTestMethodPrettified = $this->prettifier->prettifyTestMethod($test->getName());
+            }
+
+            $this->testStatus = PHPUnit_Runner_BaseTestRunner::STATUS_PASSED;
         }
     }