[2.3] Remove useless tests skips

nicolas-grekas · nicolas-grekas · commit 16085b7e77ac · 2015-01-03T14:14:51.000+01:00
diff --git a/Test/FormIntegrationTestCase.php b/Test/FormIntegrationTestCase.php
@@ -26,10 +26,6 @@ abstract class FormIntegrationTestCase extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        if (!class_exists('Symfony\Component\EventDispatcher\EventDispatcher')) {
-            $this->markTestSkipped('The "EventDispatcher" component is not available');
-        }
-
         $this->factory = Forms::createFormFactoryBuilder()
             ->addExtensions($this->getExtensions())
             ->getFormFactory();
diff --git a/Tests/AbstractFormTest.php b/Tests/AbstractFormTest.php
@@ -34,10 +34,6 @@ abstract class AbstractFormTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        if (!class_exists('Symfony\Component\EventDispatcher\EventDispatcher')) {
-            $this->markTestSkipped('The "EventDispatcher" component is not available');
-        }
-
         // We need an actual dispatcher to use the deprecated
         // bindRequest() method
         $this->dispatcher = new EventDispatcher();
diff --git a/Tests/CompoundFormTest.php b/Tests/CompoundFormTest.php
@@ -583,10 +583,6 @@ public function requestMethodProvider()
      */
     public function testSubmitPostOrPutRequest($method)
     {
-        if (!class_exists('Symfony\Component\HttpFoundation\Request')) {
-            $this->markTestSkipped('The "HttpFoundation" component is not available');
-        }
-
         $path = tempnam(sys_get_temp_dir(), 'sf2');
         touch($path);
 
@@ -635,10 +631,6 @@ public function testSubmitPostOrPutRequest($method)
      */
     public function testSubmitPostOrPutRequestWithEmptyRootFormName($method)
     {
-        if (!class_exists('Symfony\Component\HttpFoundation\Request')) {
-            $this->markTestSkipped('The "HttpFoundation" component is not available');
-        }
-
         $path = tempnam(sys_get_temp_dir(), 'sf2');
         touch($path);
 
@@ -686,10 +678,6 @@ public function testSubmitPostOrPutRequestWithEmptyRootFormName($method)
      */
     public function testSubmitPostOrPutRequestWithSingleChildForm($method)
     {
-        if (!class_exists('Symfony\Component\HttpFoundation\Request')) {
-            $this->markTestSkipped('The "HttpFoundation" component is not available');
-        }
-
         $path = tempnam(sys_get_temp_dir(), 'sf2');
         touch($path);
 
@@ -726,10 +714,6 @@ public function testSubmitPostOrPutRequestWithSingleChildForm($method)
      */
     public function testSubmitPostOrPutRequestWithSingleChildFormUploadedFile($method)
     {
-        if (!class_exists('Symfony\Component\HttpFoundation\Request')) {
-            $this->markTestSkipped('The "HttpFoundation" component is not available');
-        }
-
         $path = tempnam(sys_get_temp_dir(), 'sf2');
         touch($path);
 
@@ -755,10 +739,6 @@ public function testSubmitPostOrPutRequestWithSingleChildFormUploadedFile($metho
 
     public function testSubmitGetRequest()
     {
-        if (!class_exists('Symfony\Component\HttpFoundation\Request')) {
-            $this->markTestSkipped('The "HttpFoundation" component is not available');
-        }
-
         $values = array(
             'author' => array(
                 'firstName' => 'Bernhard',
@@ -787,10 +767,6 @@ public function testSubmitGetRequest()
 
     public function testSubmitGetRequestWithEmptyRootFormName()
     {
-        if (!class_exists('Symfony\Component\HttpFoundation\Request')) {
-            $this->markTestSkipped('The "HttpFoundation" component is not available');
-        }
-
         $values = array(
             'firstName' => 'Bernhard',
             'lastName' => 'Schussek',
diff --git a/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php b/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php
@@ -34,14 +34,6 @@ class PropertyPathMapperTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        if (!class_exists('Symfony\Component\EventDispatcher\Event')) {
-            $this->markTestSkipped('The "EventDispatcher" component is not available');
-        }
-
-        if (!class_exists('Symfony\Component\PropertyAccess\PropertyAccess')) {
-            $this->markTestSkipped('The "PropertyAccess" component is not available');
-        }
-
         $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
         $this->propertyAccessor = $this->getMock('Symfony\Component\PropertyAccess\PropertyAccessorInterface');
         $this->mapper = new PropertyPathMapper($this->propertyAccessor);
diff --git a/Tests/Extension/Core/EventListener/FixRadioInputListenerTest.php b/Tests/Extension/Core/EventListener/FixRadioInputListenerTest.php
@@ -21,10 +21,6 @@ class FixRadioInputListenerTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        if (!class_exists('Symfony\Component\EventDispatcher\EventDispatcher')) {
-            $this->markTestSkipped('The "EventDispatcher" component is not available');
-        }
-
         parent::setUp();
 
         $this->choiceList = new SimpleChoiceList(array('' => 'Empty', 0 => 'A', 1 => 'B'));
diff --git a/Tests/Extension/Core/EventListener/FixUrlProtocolListenerTest.php b/Tests/Extension/Core/EventListener/FixUrlProtocolListenerTest.php
@@ -16,13 +16,6 @@
 
 class FixUrlProtocolListenerTest extends \PHPUnit_Framework_TestCase
 {
-    protected function setUp()
-    {
-        if (!class_exists('Symfony\Component\EventDispatcher\EventDispatcher')) {
-            $this->markTestSkipped('The "EventDispatcher" component is not available');
-        }
-    }
-
     public function testFixHttpUrl()
     {
         $data = "www.symfony.com";
diff --git a/Tests/Extension/Core/EventListener/MergeCollectionListenerTest.php b/Tests/Extension/Core/EventListener/MergeCollectionListenerTest.php
@@ -22,10 +22,6 @@ abstract class MergeCollectionListenerTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        if (!class_exists('Symfony\Component\EventDispatcher\EventDispatcher')) {
-            $this->markTestSkipped('The "EventDispatcher" component is not available');
-        }
-
         $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
         $this->factory = $this->getMock('Symfony\Component\Form\FormFactoryInterface');
         $this->form = $this->getForm('axes');
diff --git a/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php b/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php
@@ -24,10 +24,6 @@ class ResizeFormListenerTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        if (!class_exists('Symfony\Component\EventDispatcher\EventDispatcher')) {
-            $this->markTestSkipped('The "EventDispatcher" component is not available');
-        }
-
         $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
         $this->factory = $this->getMock('Symfony\Component\Form\FormFactoryInterface');
         $this->form = $this->getBuilder()
diff --git a/Tests/Extension/Core/EventListener/TrimListenerTest.php b/Tests/Extension/Core/EventListener/TrimListenerTest.php
@@ -16,13 +16,6 @@
 
 class TrimListenerTest extends \PHPUnit_Framework_TestCase
 {
-    protected function setUp()
-    {
-        if (!class_exists('Symfony\Component\EventDispatcher\EventDispatcher')) {
-            $this->markTestSkipped('The "EventDispatcher" component is not available');
-        }
-    }
-
     public function testTrim()
     {
         $data = " Foo! ";
diff --git a/Tests/Extension/Csrf/CsrfProvider/SessionCsrfProviderTest.php b/Tests/Extension/Csrf/CsrfProvider/SessionCsrfProviderTest.php
@@ -20,10 +20,6 @@ class SessionCsrfProviderTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        if (!class_exists('Symfony\Component\HttpFoundation\Session\Session')) {
-            $this->markTestSkipped('The "HttpFoundation" component is not available');
-        }
-
         $this->session = $this->getMock(
             'Symfony\Component\HttpFoundation\Session\Session',
             array(),
diff --git a/Tests/Extension/Csrf/EventListener/CsrfValidationListenerTest.php b/Tests/Extension/Csrf/EventListener/CsrfValidationListenerTest.php
@@ -23,10 +23,6 @@ class CsrfValidationListenerTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        if (!class_exists('Symfony\Component\EventDispatcher\EventDispatcher')) {
-            $this->markTestSkipped('The "EventDispatcher" component is not available');
-        }
-
         $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
         $this->factory = $this->getMock('Symfony\Component\Form\FormFactoryInterface');
         $this->csrfProvider = $this->getMock('Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfProviderInterface');
diff --git a/Tests/Extension/HttpFoundation/EventListener/LegacyBindRequestListenerTest.php b/Tests/Extension/HttpFoundation/EventListener/LegacyBindRequestListenerTest.php
@@ -87,10 +87,6 @@ public function requestMethodProvider()
      */
     public function testSubmitRequest($method)
     {
-        if (!class_exists('Symfony\Component\HttpFoundation\Request')) {
-            $this->markTestSkipped('The "HttpFoundation" component is not available');
-        }
-
         $values = array('author' => $this->values);
         $files = array('author' => $this->filesNested);
         $request = new Request(array(), $values, array(), array(), $files, array(
@@ -116,10 +112,6 @@ public function testSubmitRequest($method)
      */
     public function testSubmitRequestWithEmptyName($method)
     {
-        if (!class_exists('Symfony\Component\HttpFoundation\Request')) {
-            $this->markTestSkipped('The "HttpFoundation" component is not available');
-        }
-
         $request = new Request(array(), $this->values, array(), array(), $this->filesPlain, array(
             'REQUEST_METHOD' => $method,
         ));
@@ -143,10 +135,6 @@ public function testSubmitRequestWithEmptyName($method)
      */
     public function testSubmitEmptyRequestToCompoundForm($method)
     {
-        if (!class_exists('Symfony\Component\HttpFoundation\Request')) {
-            $this->markTestSkipped('The "HttpFoundation" component is not available');
-        }
-
         $request = new Request(array(), array(), array(), array(), array(), array(
             'REQUEST_METHOD' => $method,
         ));
@@ -170,10 +158,6 @@ public function testSubmitEmptyRequestToCompoundForm($method)
      */
     public function testSubmitEmptyRequestToSimpleForm($method)
     {
-        if (!class_exists('Symfony\Component\HttpFoundation\Request')) {
-            $this->markTestSkipped('The "HttpFoundation" component is not available');
-        }
-
         $request = new Request(array(), array(), array(), array(), array(), array(
             'REQUEST_METHOD' => $method,
         ));
@@ -193,10 +177,6 @@ public function testSubmitEmptyRequestToSimpleForm($method)
 
     public function testSubmitGetRequest()
     {
-        if (!class_exists('Symfony\Component\HttpFoundation\Request')) {
-            $this->markTestSkipped('The "HttpFoundation" component is not available');
-        }
-
         $values = array('author' => $this->values);
         $request = new Request($values, array(), array(), array(), array(), array(
             'REQUEST_METHOD' => 'GET',
@@ -218,10 +198,6 @@ public function testSubmitGetRequest()
 
     public function testSubmitGetRequestWithEmptyName()
     {
-        if (!class_exists('Symfony\Component\HttpFoundation\Request')) {
-            $this->markTestSkipped('The "HttpFoundation" component is not available');
-        }
-
         $request = new Request($this->values, array(), array(), array(), array(), array(
             'REQUEST_METHOD' => 'GET',
         ));
@@ -242,10 +218,6 @@ public function testSubmitGetRequestWithEmptyName()
 
     public function testSubmitEmptyGetRequestToCompoundForm()
     {
-        if (!class_exists('Symfony\Component\HttpFoundation\Request')) {
-            $this->markTestSkipped('The "HttpFoundation" component is not available');
-        }
-
         $request = new Request(array(), array(), array(), array(), array(), array(
             'REQUEST_METHOD' => 'GET',
         ));
@@ -265,10 +237,6 @@ public function testSubmitEmptyGetRequestToCompoundForm()
 
     public function testSubmitEmptyGetRequestToSimpleForm()
     {
-        if (!class_exists('Symfony\Component\HttpFoundation\Request')) {
-            $this->markTestSkipped('The "HttpFoundation" component is not available');
-        }
-
         $request = new Request(array(), array(), array(), array(), array(), array(
             'REQUEST_METHOD' => 'GET',
         ));
diff --git a/Tests/Extension/Validator/EventListener/ValidationListenerTest.php b/Tests/Extension/Validator/EventListener/ValidationListenerTest.php
@@ -53,10 +53,6 @@ class ValidationListenerTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        if (!class_exists('Symfony\Component\EventDispatcher\Event')) {
-            $this->markTestSkipped('The "EventDispatcher" component is not available');
-        }
-
         $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
         $this->factory = $this->getMock('Symfony\Component\Form\FormFactoryInterface');
         $this->validator = $this->getMock('Symfony\Component\Validator\ValidatorInterface');
diff --git a/Tests/Extension/Validator/Type/TypeTestCase.php b/Tests/Extension/Validator/Type/TypeTestCase.php
@@ -20,10 +20,6 @@ abstract class TypeTestCase extends BaseTypeTestCase
 
     protected function setUp()
     {
-        if (!class_exists('Symfony\Component\Validator\Constraint')) {
-            $this->markTestSkipped('The "Validator" component is not available');
-        }
-
         $this->validator = $this->getMock('Symfony\Component\Validator\ValidatorInterface');
         $metadataFactory = $this->getMock('Symfony\Component\Validator\MetadataFactoryInterface');
         $this->validator->expects($this->once())->method('getMetadataFactory')->will($this->returnValue($metadataFactory));
diff --git a/Tests/Extension/Validator/ValidatorTypeGuesserTest.php b/Tests/Extension/Validator/ValidatorTypeGuesserTest.php
@@ -50,10 +50,6 @@ class ValidatorTypeGuesserTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        if (!class_exists('Symfony\Component\Validator\Constraint')) {
-            $this->markTestSkipped('The "Validator" component is not available');
-        }
-
         $this->metadata = new ClassMetadata(self::TEST_CLASS);
         $this->metadataFactory = $this->getMock('Symfony\Component\Validator\MetadataFactoryInterface');
         $this->metadataFactory->expects($this->any())
diff --git a/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php b/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php
@@ -60,10 +60,6 @@ class ViolationMapperTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        if (!class_exists('Symfony\Component\EventDispatcher\Event')) {
-            $this->markTestSkipped('The "EventDispatcher" component is not available');
-        }
-
         $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
         $this->mapper = new ViolationMapper();
         $this->message = 'Message';
diff --git a/Tests/FormBuilderTest.php b/Tests/FormBuilderTest.php
@@ -21,10 +21,6 @@ class FormBuilderTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        if (!class_exists('Symfony\Component\EventDispatcher\EventDispatcher')) {
-            $this->markTestSkipped('The "EventDispatcher" component is not available');
-        }
-
         $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
         $this->factory = $this->getMock('Symfony\Component\Form\FormFactoryInterface');
         $this->builder = new FormBuilder('name', null, $this->dispatcher, $this->factory);
diff --git a/Tests/FormFactoryTest.php b/Tests/FormFactoryTest.php
@@ -52,10 +52,6 @@ class FormFactoryTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        if (!class_exists('Symfony\Component\EventDispatcher\EventDispatcher')) {
-            $this->markTestSkipped('The "EventDispatcher" component is not available');
-        }
-
         $this->resolvedTypeFactory = $this->getMock('Symfony\Component\Form\ResolvedFormTypeFactoryInterface');
         $this->guesser1 = $this->getMock('Symfony\Component\Form\FormTypeGuesserInterface');
         $this->guesser2 = $this->getMock('Symfony\Component\Form\FormTypeGuesserInterface');
diff --git a/Tests/ResolvedFormTypeTest.php b/Tests/ResolvedFormTypeTest.php
@@ -38,25 +38,13 @@ class ResolvedFormTypeTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        if (!class_exists('Symfony\Component\OptionsResolver\OptionsResolver')) {
-            $this->markTestSkipped('The "OptionsResolver" component is not available');
-        }
-
-        if (!class_exists('Symfony\Component\EventDispatcher\EventDispatcher')) {
-            $this->markTestSkipped('The "EventDispatcher" component is not available');
-        }
-
         $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
         $this->factory = $this->getMock('Symfony\Component\Form\FormFactoryInterface');
         $this->dataMapper = $this->getMock('Symfony\Component\Form\DataMapperInterface');
     }
 
     public function testCreateBuilder()
     {
-        if (version_compare(\PHPUnit_Runner_Version::id(), '3.7', '<')) {
-            $this->markTestSkipped('This test requires PHPUnit 3.7.');
-        }
-
         $parentType = $this->getMockFormType();
         $type = $this->getMockFormType();
         $extension1 = $this->getMockFormTypeExtension();

Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,6 @@ class FixRadioInputListenerTest extends \PHPUnit_Framework_TestCase`
`21`	`21`
`22`	`22`	`protected function setUp()`
`23`	`23`	`{`
`24`		`- if (!class_exists('Symfony\Component\EventDispatcher\EventDispatcher')) {`
`25`		`- $this->markTestSkipped('The "EventDispatcher" component is not available');`
`26`		`- }`
`27`		`-`
`28`	`24`	`parent::setUp();`
`29`	`25`
`30`	`26`	`$this->choiceList = new SimpleChoiceList(array('' => 'Empty', 0 => 'A', 1 => 'B'));`
Original file line number	Diff line number	Diff line change
`@@ -16,13 +16,6 @@`
`16`	`16`
`17`	`17`	`class FixUrlProtocolListenerTest extends \PHPUnit_Framework_TestCase`
`18`	`18`	`{`
`19`		`- protected function setUp()`
`20`		`- {`
`21`		`- if (!class_exists('Symfony\Component\EventDispatcher\EventDispatcher')) {`
`22`		`- $this->markTestSkipped('The "EventDispatcher" component is not available');`
`23`		`- }`
`24`		`- }`
`25`		`-`
`26`	`19`	`public function testFixHttpUrl()`
`27`	`20`	`{`
`28`	`21`	`$data = "www.symfony.com";`