Fix not failing for tests using data providers

Fixes #19
oradwell · May 8, 2018 · 1401997 · 1401997
1 parent af86682
commit 1401997
Show file tree

Hide file tree

Showing 6 changed files with 89 additions and 2 deletions.
diff --git a/src/Command/ValidateCommand.php b/src/Command/ValidateCommand.php
@@ -73,8 +73,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
             }
 
             $testClass = get_class($suite);
-            $testMethod = $suite->getName();
-            $testSignature = $testClass . '::' . $testMethod;
+            $testMethod = $suite->getName(false);
+            $testSignature = $testClass . '::' . $suite->getName();
 
             if ($output->getVerbosity() >= OutputInterface::VERBOSITY_DEBUG) {
                 $this->writeValidity($output, 'Validating ' . $testSignature . '...');

diff --git a/tests/Command/ValidateCommandTest.php b/tests/Command/ValidateCommandTest.php
@@ -95,6 +95,22 @@ public function testReturnsFailForEmptyCoversTag()
         $this->assertRegExp('/There were 1 test\(s\) with invalid @covers tags./', $display);
     }
 
+    public function testReturnsFailForInvalidCoversTagWithProvider()
+    {
+        $app = new CoversValidator;
+        /** @var ValidateCommand $command */
+        $command = $app->find('validate');
+        $commandTester = new CommandTester($command);
+        $exitCode = $commandTester->execute(array(
+            '-c' => 'tests/Fixtures/configuration-nonexistentprovider.xml'
+        ));
+
+        $this->assertGreaterThan(0, $exitCode);
+        $display = $commandTester->getDisplay();
+        $this->assertRegExp('/Invalid - /', $display);
+        $this->assertRegExp('/There were 1 test\(s\) with invalid @covers tags./', $display);
+    }
+
     public function testReturnsSuccessForExistingClasses()
     {
         $app = new CoversValidator;
@@ -116,6 +132,21 @@ public function testReturnsSuccessForExistingClasses()
         $this->assertRegExp('/Validating /', $display);
     }
 
+    public function testReturnsSuccessForValidCoversTagWithProvider()
+    {
+        $app = new CoversValidator;
+        /** @var ValidateCommand $command */
+        $command = $app->find('validate');
+        $commandTester = new CommandTester($command);
+        $exitCode = $commandTester->execute(array(
+            '-c' => 'tests/Fixtures/configuration-existingprovider.xml'
+        ));
+
+        $this->assertSame(0, $exitCode);
+        $display = $commandTester->getDisplay();
+        $this->assertRegExp('/Validation complete. All @covers tags are valid./', $display);
+    }
+
     public function testReturnsFailForComboClasses()
     {
         $app = new CoversValidator;

diff --git a/tests/Fixtures/OneTestWithProviderCoveringExistingClassTest.php b/tests/Fixtures/OneTestWithProviderCoveringExistingClassTest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace OckCyp\CoversValidator\Tests\Fixtures;
+
+class OneTestWithProviderCoveringExistingClassTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers OckCyp\CoversValidator\Tests\Fixtures\ExistingClass::existingMethod
+     * @dataProvider provideDummyTest
+     */
+    public function testDummyTest()
+    {
+
+    }
+
+    public function provideDummyTest()
+    {
+
+    }
+}
diff --git a/tests/Fixtures/OneTestWithProviderCoveringNonExistentClassTest.php b/tests/Fixtures/OneTestWithProviderCoveringNonExistentClassTest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace OckCyp\CoversValidator\Tests\Fixtures;
+
+class OneTestWithProviderCoveringNonExistentClassTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers OckCyp\CoversValidator\Tests\Fixtures\ExistingClass::nonExistingMethod
+     * @dataProvider provideDummyTest
+     */
+    public function testDummyTest($x)
+    {
+
+    }
+
+    public function provideDummyTest()
+    {
+        return [['x']];
+    }
+}
diff --git a/tests/Fixtures/configuration-existingprovider.xml b/tests/Fixtures/configuration-existingprovider.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<phpunit>
+  <testsuites>
+    <testsuite name="My Test Suite">
+      <file>./OneTestWithProviderCoveringExistingClassTest.php</file>
+    </testsuite>
+  </testsuites>
+</phpunit>
diff --git a/tests/Fixtures/configuration-nonexistentprovider.xml b/tests/Fixtures/configuration-nonexistentprovider.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<phpunit>
+  <testsuites>
+    <testsuite name="My Test Suite">
+      <file>./OneTestWithProviderCoveringNonExistentClassTest.php</file>
+    </testsuite>
+  </testsuites>
+</phpunit>