[Form] Moved form type tests into according namespace

tests/Symfony/Tests/Component/Form/DateTimeTestCase.php

@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form;
+namespace Symfony\Tests\Component\Form\DataTransformer;
 
-require_once __DIR__ . '/LocalizedTestCase.php';
+require_once __DIR__.'/LocalizedTestCase.php';
 
 class DateTimeTestCase extends LocalizedTestCase
 {

tests/Symfony/Tests/Component/Form/DataTransformer/DateTimeToArrayTransformerTest.php

@@ -11,10 +11,9 @@
 
 namespace Symfony\Tests\Component\Form\DataTransformer;
 
-require_once __DIR__ . '/../DateTimeTestCase.php';
+require_once __DIR__ . '/DateTimeTestCase.php';
 
 use Symfony\Component\Form\DataTransformer\DateTimeToArrayTransformer;
-use Symfony\Tests\Component\Form\DateTimeTestCase;
 
 class DateTimeToArrayTransformerTest extends DateTimeTestCase
 {

tests/Symfony/Tests/Component/Form/DataTransformer/DateTimeToLocalizedStringTransformerTest.php

@@ -11,10 +11,9 @@
 
 namespace Symfony\Tests\Component\Form\DataTransformer;
 
-require_once __DIR__ . '/../DateTimeTestCase.php';
+require_once __DIR__ . '/DateTimeTestCase.php';
 
 use Symfony\Component\Form\DataTransformer\DateTimeToLocalizedStringTransformer;
-use Symfony\Tests\Component\Form\DateTimeTestCase;
 
 class DateTimeToLocalizedStringTransformerTest extends DateTimeTestCase
 {

tests/Symfony/Tests/Component/Form/DataTransformer/DateTimeToStringTransformerTest.php

@@ -11,10 +11,9 @@
 
 namespace Symfony\Tests\Component\Form\DataTransformer;
 
-require_once __DIR__ . '/../DateTimeTestCase.php';
+require_once __DIR__ . '/DateTimeTestCase.php';
 
 use Symfony\Component\Form\DataTransformer\DateTimeToStringTransformer;
-use Symfony\Tests\Component\Form\DateTimeTestCase;
 
 class DateTimeToStringTransformerTest extends DateTimeTestCase
 {

tests/Symfony/Tests/Component/Form/DataTransformer/DateTimeToTimestampTransformerTest.php

@@ -11,10 +11,9 @@
 
 namespace Symfony\Tests\Component\Form\DataTransformer;
 
-require_once __DIR__ . '/../DateTimeTestCase.php';
+require_once __DIR__ . '/DateTimeTestCase.php';
 
 use Symfony\Component\Form\DataTransformer\DateTimeToTimestampTransformer;
-use Symfony\Tests\Component\Form\DateTimeTestCase;
 
 class DateTimeToTimestampTransformerTest extends DateTimeTestCase
 {

tests/Symfony/Tests/Component/Form/DataTransformer/LocalizedTestCase.php

@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form\DataTransformer;
+
+class LocalizedTestCase extends \PHPUnit_Framework_TestCase
+{
+    protected function setUp()
+    {
+        parent::setUp();
+
+        if (!extension_loaded('intl')) {
+            $this->markTestSkipped('The "intl" extension is not available');
+        }
+    }
+}

tests/Symfony/Tests/Component/Form/DataTransformer/MoneyToLocalizedStringTransformerTest.php

@@ -11,10 +11,9 @@
 
 namespace Symfony\Tests\Component\Form\DataTransformer;
 
-require_once __DIR__ . '/../LocalizedTestCase.php';
+require_once __DIR__ . '/LocalizedTestCase.php';
 
 use Symfony\Component\Form\DataTransformer\MoneyToLocalizedStringTransformer;
-use Symfony\Tests\Component\Form\LocalizedTestCase;
 
 
 class MoneyToLocalizedStringTransformerTest extends LocalizedTestCase

tests/Symfony/Tests/Component/Form/DataTransformer/NumberToLocalizedStringTransformerTest.php

@@ -11,10 +11,9 @@
 
 namespace Symfony\Tests\Component\Form\DataTransformer;
 
-require_once __DIR__ . '/../LocalizedTestCase.php';
+require_once __DIR__ . '/LocalizedTestCase.php';
 
 use Symfony\Component\Form\DataTransformer\NumberToLocalizedStringTransformer;
-use Symfony\Tests\Component\Form\LocalizedTestCase;
 
 class NumberToLocalizedStringTransformerTest extends LocalizedTestCase
 {

tests/Symfony/Tests/Component/Form/DataTransformer/PercentToLocalizedStringTransformerTest.php

@@ -11,10 +11,9 @@
 
 namespace Symfony\Tests\Component\Form\DataTransformer;
 
-require_once __DIR__ . '/../LocalizedTestCase.php';
+require_once __DIR__ . '/LocalizedTestCase.php';
 
 use Symfony\Component\Form\DataTransformer\PercentToLocalizedStringTransformer;
-use Symfony\Tests\Component\Form\LocalizedTestCase;
 
 class PercentToLocalizedStringTransformerTest extends LocalizedTestCase
 {

tests/Symfony/Tests/Component/Form/ChoiceFieldTest.php

@@ -9,14 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form;
+namespace Symfony\Tests\Component\Form\Type;
 
 require_once __DIR__.'/TestCase.php';
 
 use Symfony\Component\Form\ChoiceField;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
 
-class ChoiceFieldTest extends TestCase
+class ChoiceTypeTest extends TestCase
 {
     protected $choices = array(
         'a' => 'Bernhard',

tests/Symfony/Tests/Component/Form/CollectionFieldTest.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form;
+namespace Symfony\Tests\Component\Form\Type;
 
 require_once __DIR__.'/TestCase.php';
 

tests/Symfony/Tests/Component/Form/CountryFieldTest.php

@@ -9,14 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form;
+namespace Symfony\Tests\Component\Form\Type;
 
 use Symfony\Component\Form\CountryField;
 use Symfony\Component\Form\FormContext;
 
 require_once __DIR__.'/TestCase.php';
 
-class CountryFieldTest extends TestCase
+class CountryTypeTest extends TestCase
 {
     public function testCountriesAreSelectable()
     {

tests/Symfony/Tests/Component/Form/Type/DateTimeTestCase.php

@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Form\Type;
+
+require_once __DIR__ . '/LocalizedTestCase.php';
+
+abstract class DateTimeTestCase extends LocalizedTestCase
+{
+    public static function assertDateTimeEquals(\DateTime $expected, \DateTime $actual)
+    {
+        self::assertEquals($expected->format('c'), $actual->format('c'));
+    }
+}

tests/Symfony/Tests/Component/Form/DateTimeFieldTest.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form;
+namespace Symfony\Tests\Component\Form\Type;
 
 require_once __DIR__ . '/DateTimeTestCase.php';
 
@@ -17,7 +17,7 @@ use Symfony\Component\Form\DateTimeField;
 use Symfony\Component\Form\DateField;
 use Symfony\Component\Form\TimeField;
 
-class DateTimeFieldTest extends DateTimeTestCase
+class DateTimeTypeTest extends DateTimeTestCase
 {
     public function testSubmit_dateTime()
     {

tests/Symfony/Tests/Component/Form/DateFieldTest.php

@@ -9,14 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form;
+namespace Symfony\Tests\Component\Form\Type;
 
 require_once __DIR__ . '/DateTimeTestCase.php';
 
 use Symfony\Component\Form\DateField;
 use Symfony\Component\Form\FormContext;
 
-class DateFieldTest extends DateTimeTestCase
+class DateTypeTest extends DateTimeTestCase
 {
     protected function setUp()
     {

tests/Symfony/Tests/Component/Form/DoctrineOrmTestCase.php

@@ -9,17 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form;
+namespace Symfony\Tests\Component\Form\Type;
 
 require_once __DIR__.'/TestCase.php';
 
 use Doctrine\ORM\EntityManager;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
-use Symfony\Bundle\DoctrineBundle\DependencyInjection\DoctrineExtension;
-use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 
-class DoctrineOrmTestCase extends TestCase
+abstract class DoctrineOrmTestCase extends TestCase
 {
     protected function setUp()
     {

tests/Symfony/Tests/Component/Form/EntityChoiceFieldTest.php

@@ -9,20 +9,19 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form;
+namespace Symfony\Tests\Component\Form\Type;
 
 require_once __DIR__.'/DoctrineOrmTestCase.php';
-require_once __DIR__.'/Fixtures/SingleIdentEntity.php';
-require_once __DIR__.'/Fixtures/CompositeIdentEntity.php';
+require_once __DIR__.'/../Fixtures/SingleIdentEntity.php';
+require_once __DIR__.'/../Fixtures/CompositeIdentEntity.php';
 
-use Symfony\Component\Form\EntityChoiceField;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
 use Symfony\Tests\Component\Form\Fixtures\SingleIdentEntity;
 use Symfony\Tests\Component\Form\Fixtures\CompositeIdentEntity;
 use Doctrine\ORM\Tools\SchemaTool;
 use Doctrine\Common\Collections\ArrayCollection;
 
-class EntityChoiceFieldTest extends DoctrineOrmTestCase
+class EntityChoiceTypeTest extends DoctrineOrmTestCase
 {
     const SINGLE_IDENT_CLASS = 'Symfony\Tests\Component\Form\Fixtures\SingleIdentEntity';
 

tests/Symfony/Tests/Component/Form/FieldTest.php

@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form;
+namespace Symfony\Tests\Component\Form\Type;
 
 require_once __DIR__ . '/TestCase.php';
-require_once __DIR__ . '/Fixtures/Author.php';
-require_once __DIR__ . '/Fixtures/FixedDataTransformer.php';
-require_once __DIR__ . '/Fixtures/FixedFilterListener.php';
+require_once __DIR__ . '/../Fixtures/Author.php';
+require_once __DIR__ . '/../Fixtures/FixedDataTransformer.php';
+require_once __DIR__ . '/../Fixtures/FixedFilterListener.php';
 
 use Symfony\Component\Form\DataTransformer\DataTransformerInterface;
 use Symfony\Component\Form\PropertyPath;
@@ -25,7 +25,7 @@ use Symfony\Tests\Component\Form\Fixtures\Author;
 use Symfony\Tests\Component\Form\Fixtures\FixedDataTransformer;
 use Symfony\Tests\Component\Form\Fixtures\FixedFilterListener;
 
-class FieldTest extends TestCase
+class FieldTypeTest extends TestCase
 {
     protected $field;
 

tests/Symfony/Tests/Component/Form/FileFieldTest.php

@@ -9,14 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form;
+namespace Symfony\Tests\Component\Form\Type;
 
 require_once __DIR__.'/TestCase.php';
 
 use Symfony\Component\Form\FileField;
 use Symfony\Component\HttpFoundation\File\File;
 
-class FileFieldTest extends TestCase
+class FileTypeTest extends TestCase
 {
     public static $tmpFiles = array();
 

tests/Symfony/Tests/Component/Form/FormTest.php

@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form;
+namespace Symfony\Tests\Component\Form\Type;
 
 require_once __DIR__ . '/TestCase.php';
-require_once __DIR__ . '/Fixtures/Author.php';
+require_once __DIR__ . '/../Fixtures/Author.php';
 
 use Symfony\Component\Form\Form;
 use Symfony\Component\Form\FormContext;

tests/Symfony/Tests/Component/Form/IntegerFieldTest.php

@@ -9,13 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form;
+namespace Symfony\Tests\Component\Form\Type;
 
 require_once __DIR__ . '/LocalizedTestCase.php';
 
 use Symfony\Component\Form\IntegerField;
 
-class IntegerFieldTest extends LocalizedTestCase
+class IntegerTypeTest extends LocalizedTestCase
 {
     public function testSubmitCastsToInteger()
     {

tests/Symfony/Tests/Component/Form/LanguageFieldTest.php

@@ -9,14 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form;
+namespace Symfony\Tests\Component\Form\Type;
 
 require_once __DIR__.'/TestCase.php';
 
 use Symfony\Component\Form\LanguageField;
 use Symfony\Component\Form\FormContext;
 
-class LanguageFieldTest extends TestCase
+class LanguageTypeTest extends TestCase
 {
     public function testCountriesAreSelectable()
     {

tests/Symfony/Tests/Component/Form/LocaleFieldTest.php

@@ -9,14 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form;
+namespace Symfony\Tests\Component\Form\Type;
 
 require_once __DIR__.'/TestCase.php';
 
 use Symfony\Component\Form\LocaleField;
 use Symfony\Component\Form\FormContext;
 
-class LocaleFieldTest extends TestCase
+class LocaleTypeTest extends TestCase
 {
     public function testLocalesAreSelectable()
     {

tests/Symfony/Tests/Component/Form/LocalizedTestCase.php

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form;
+namespace Symfony\Tests\Component\Form\Type;
 
 require_once __DIR__ . '/TestCase.php';
 
-class LocalizedTestCase extends TestCase
+abstract class LocalizedTestCase extends TestCase
 {
     protected function setUp()
     {

tests/Symfony/Tests/Component/Form/PasswordFieldTest.php

@@ -9,13 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form;
+namespace Symfony\Tests\Component\Form\Type;
 
 require_once __DIR__.'/TestCase.php';
 
 use Symfony\Component\Form\PasswordField;
 
-class PasswordFieldTest extends TestCase
+class PasswordTypeTest extends TestCase
 {
     public function testGetDisplayedData_beforeSubmit()
     {

tests/Symfony/Tests/Component/Form/RepeatedFieldTest.php

@@ -9,14 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form;
+namespace Symfony\Tests\Component\Form\Type;
 
 require_once __DIR__.'/TestCase.php';
 
 use Symfony\Component\Form\RepeatedField;
 use Symfony\Component\Form\Field;
 
-class RepeatedFieldTest extends TestCase
+class RepeatedTypeTest extends TestCase
 {
     protected $field;
 

tests/Symfony/Tests/Component/Form/TestCase.php

@@ -9,14 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form;
+namespace Symfony\Tests\Component\Form\Type;
 
 use Symfony\Component\Form\FormBuilder;
 use Symfony\Component\Form\FormFactory;
 use Symfony\Component\Form\Type\Loader\DefaultTypeLoader;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 
-class TestCase extends \PHPUnit_Framework_TestCase
+abstract class TestCase extends \PHPUnit_Framework_TestCase
 {
     protected $theme;
 

tests/Symfony/Tests/Component/Form/TimeFieldTest.php

@@ -9,13 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form;
+namespace Symfony\Tests\Component\Form\Type;
 
 require_once __DIR__ . '/DateTimeTestCase.php';
 
 use Symfony\Component\Form\TimeField;
 
-class TimeFieldTest extends DateTimeTestCase
+class TimeTypeTest extends DateTimeTestCase
 {
     public function testSubmit_dateTime()
     {

tests/Symfony/Tests/Component/Form/TimezoneFieldTest.php

@@ -9,13 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form;
+namespace Symfony\Tests\Component\Form\Type;
 
 require_once __DIR__.'/TestCase.php';
 
 use Symfony\Component\Form\TimezoneField;
 
-class TimezoneFieldTest extends TestCase
+class TimezoneTypeTest extends TestCase
 {
     public function testTimezonesAreSelectable()
     {

tests/Symfony/Tests/Component/Form/UrlFieldTest.php

@@ -9,13 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\Form;
+namespace Symfony\Tests\Component\Form\Type;
 
 require_once __DIR__ . '/LocalizedTestCase.php';
 
 use Symfony\Component\Form\UrlField;
 
-class UrlFieldTest extends LocalizedTestCase
+class UrlTypeTest extends LocalizedTestCase
 {
     public function testSubmitAddsDefaultProtocolIfNoneIsIncluded()
     {