Merge pull request #12 from alnorth/master

Ensure annotations work on tests that use dataProviders

Author: renatomefi

PHPUnit/Util/Log/VCR.php

@@ -122,7 +122,7 @@ public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
     public function startTest(PHPUnit_Framework_Test $test)
     {
         $class      = get_class($test);
-        $method     = $test->getName();
+        $method     = $test->getName(false);
 
         if (!method_exists($class, $method)) {
             return;

tests/PHPUnit/Util/Log/VCRTest.php

@@ -23,4 +23,23 @@ public function testInterceptsWithAnnotations()
         $result = file_get_contents('http://google.com');
         $this->assertEquals('This is a annotation test dummy.', $result, 'Call was not intercepted (using annotations).');
     }
+
+    /**
+     * @vcr unittest_annotation_test
+     * @dataProvider aDataProvider
+     */
+    public function testInterceptsWithAnnotationsWhenUsingDataProvider($dummyValue)
+    {
+        // Content of tests/fixtures/unittest_annotation_test: "This is a annotation test dummy".
+        $result = file_get_contents('http://google.com');
+        $this->assertEquals('This is a annotation test dummy.', $result, 'Call was not intercepted (using annotations with data provider).');
+    }
+
+    public function aDataProvider()
+    {
+        return array(
+            array(1),
+            array(2)
+        );
+    }
 }