- Close #249.

sebastianbergmann · Nov 9, 2007 · 8e6ea00 · 8e6ea00
1 parent dc277fe
commit 8e6ea00
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/PHPUnit/Extensions/SeleniumTestCase.php b/PHPUnit/Extensions/SeleniumTestCase.php
@@ -216,9 +216,9 @@ public static function suite($className)
 
         foreach ($class->getMethods() as $method) {
             if (PHPUnit_Framework_TestSuite::isPublicTestMethod($method)) {
-                $data   = PHPUnit_Util_Test::getProvidedData($method);
-                $groups = PHPUnit_Util_Test::getGroups($method, $classGroups);
                 $name   = $method->getName();
+                $data   = PHPUnit_Util_Test::getProvidedData($className, $name);
+                $groups = PHPUnit_Util_Test::getGroups($method, $classGroups);
 
                 if (isset($staticProperties['browsers'])) {
                     foreach ($staticProperties['browsers'] as $browser) {

diff --git a/PHPUnit/Framework/TestSuite.php b/PHPUnit/Framework/TestSuite.php
@@ -487,7 +487,7 @@ public static function createTest(ReflectionClass $theClass, $name)
 
             // TestCase($name, $data)
             else {
-                $data = PHPUnit_Util_Test::getProvidedData($method);
+                $data = PHPUnit_Util_Test::getProvidedData($className, $name);
 
                 if (is_array($data) || $data instanceof Iterator) {
                      $test = new PHPUnit_Framework_TestSuite(

diff --git a/PHPUnit/Util/Test.php b/PHPUnit/Util/Test.php
@@ -212,21 +212,22 @@ public static function getGroups(Reflector $reflector, array $groups = array())
     /**
      * Returns the provided data for a method.
      *
-     * @param  ReflectionMethod $method
+     * @param  string $className
+     * @param  string $methodName
      * @return array
      * @access public
      * @static
      * @since  Method available since Release 3.2.0
      */
-    public static function getProvidedData(ReflectionMethod $method)
+    public static function getProvidedData($className, $methodName)
     {
+        $method     = new ReflectionMethod($className, $methodName);
         $docComment = $method->getDocComment();
 
         if (preg_match('/@dataProvider[\s]+([\.\w]+)/', $docComment, $matches)) {
             try {
                 $dataProviderMethod = new ReflectionMethod(
-                  $method->getDeclaringClass()->getName(),
-                  $matches[1]
+                  $className, $matches[1]
                 );
 
                 return $dataProviderMethod->invoke(NULL);