symfony
diff --git a/‎src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
Lines changed: 280 additions & 106 deletions b/‎src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
Lines changed: 280 additions & 106 deletions
diff --git a/‎src/Symfony/Component/Form/Tests/Extension/Core/Type/BaseTypeTest.php
Lines changed: 29 additions & 14 deletions b/‎src/Symfony/Component/Form/Tests/Extension/Core/Type/BaseTypeTest.php
Lines changed: 29 additions & 14 deletions
diff --git a/‎src/Symfony/Component/Form/Tests/Extension/Core/Ty F438 pe/BirthdayTypeTest.php
Lines changed: 4 additions & 7 deletions b/‎src/Symfony/Component/Form/Tests/Extension/Core/Ty F438 pe/BirthdayTypeTest.php
Lines changed: 4 additions & 7 deletions
diff --git a/‎src/Symfony/Component/Form/Tests/Extension/Core/Type/ButtonTypeTest.php
Lines changed: 3 additions & 6 deletions b/‎src/Symfony/Component/Form/Tests/Extension/Core/Type/ButtonTypeTest.php
Lines changed: 3 additions & 6 deletions
diff --git a/‎src/Symfony/Component/Form/Tests/Extension/Core/Type/CheckboxTypeTest.php
Lines changed: 28 additions & 22 deletions b/‎src/Symfony/Component/Form/Tests/Extension/Core/Type/CheckboxTypeTest.php
Lines changed: 28 additions & 22 deletions
@@ -18,6 +18,8 @@
  */
 abstract class BaseTypeTest extends TypeTestCase
 {
+    const TESTED_TYPE = '';
+
     public function testPassDisabledAsOption()
     {
         $form = $this->factory->create($this->getTestedType(), null, array('disabled' => true));
@@ -47,7 +49,7 @@ public function testStripLeadingUnderscoresAndDigitsFromId()
 
     public function testPassIdAndNameToViewWithParent()
     {
-        $view = $this->factory->createNamedBuilder('parent', 'form')
+        $view = $this->factory->createNamedBuilder('parent', FormTypeTest::TESTED_TYPE)
             ->add('child', $this->getTestedType())
             ->getForm()
             ->createView();
@@ -59,8 +61,8 @@ public function testPassIdAndNameToViewWithParent()
 
     public function testPassIdAndNameToViewWithGrandParent()
     {
-        $builder = $this->factory->createNamedBuilder('parent', 'form')
-            ->add('child', 'form');
+        $builder = $this->factory->createNamedBuilder('parent', FormTypeTest::TESTED_TYPE)
+            ->add('child', FormTypeTest::TESTED_TYPE);
         $builder->get('child')->add('grand_child', $this->getTestedType());
         $view = $builder->getForm()->createView();
 
@@ -71,18 +73,18 @@ public function testPassIdAndNameToViewWithGrandParent()
 
     public function testPassTranslationDomainToView()
     {
-        $form = $this->factory->create($this->getTestedType(), null, array(
+        $view = $this->factory->create($this->getTestedType(), null, array(
             'translation_domain' => 'domain',
-        ));
-        $view = $form->createView();
+        ))
+            ->createView();
 
         $this->assertSame('domain', $view->vars['translation_domain']);
     }
 
     public function testInheritTranslationDomainFromParent()
     {
         $view = $this->factory
-            ->createNamedBuilder('parent', 'form', null, array(
+            ->createNamedBuilder('parent', FormTypeTest::TESTED_TYPE, null, array(
                 'translation_domain' => 'domain',
             ))
             ->add('child', $this->getTestedType())
@@ -95,7 +97,7 @@ public function testInheritTranslationDomainFromParent()
     public function testPreferOwnTranslationDomain()
     {
         $view = $this->factory
-            ->createNamedBuilder('parent', 'form', null, array(
+            ->createNamedBuilder('parent', FormTypeTest::TESTED_TYPE, null, array(
                 'translation_domain' => 'parent_domain',
             ))
             ->add('child', $this->getTestedType(), array(
@@ -109,7 +111,7 @@ public function testPreferOwnTranslationDomain()
 
     public function testDefaultTranslationDomain()
     {
-        $view = $this->factory->createNamedBuilder('parent', 'form')
+        $view = $this->factory->createNamedBuilder('parent', FormTypeTest::TESTED_TYPE)
             ->add('child', $this->getTestedType())
             ->getForm()
             ->createView();
@@ -119,19 +121,32 @@ public function testDefaultTranslationDomain()
 
     public function testPassLabelToView()
     {
-        $form = $this->factory->createNamed('__test___field', $this->getTestedType(), null, array('label' => 'My label'));
-        $view = $form->createView();
+        $view = $this->factory->createNamed('__test___field', $this->getTestedType(), null, array('label' => 'My label'))
+            ->createView();
 
         $this->assertSame('My label', $view->vars['label']);
     }
 
     public function testPassMultipartFalseToView()
     {
-        $form = $this->factory->create($this->getTestedType());
-        $view = $form->createView();
+        $view = $this->factory->create($this->getTestedType())
+            ->createView();
 
         $this->assertFalse($view->vars['multipart']);
     }
 
-    abstract protected function getTestedType();
+    public function testSubmitNull($expected = null, $norm = null, $view = null)
+    {
+        $form = $this->factory->create($this->getTestedType());
+        $form->submit(null);
+
+        $this->assertSame($expected, $form->getData());
+        $this->assertSame($norm, $form->getNormData());
+        $this->assertSame($view, $form->getViewData());
+    }
+
+    protected function getTestedType()
+    {
+        return static::TESTED_TYPE;
+    }
 }
@@ -14,20 +14,17 @@
 /**
  * @author Stepan Anchugov <kixxx1@gmail.com>
  */
-class BirthdayTypeTest extends BaseTypeTest
+class BirthdayTypeTest extends DateTypeTest
 {
+    const TESTED_TYPE = 'birthday';
+
     /**
      * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
      */
     public function testSetInvalidYearsOption()
     {
-        $this->factory->create('birthday', null, array(
+        $this->factory->create(static::TESTED_TYPE, null, array(
             'years' => 'bad value',
         ));
     }
-
-    protected function getTestedType()
-    {
-        return 'birthday';
-    }
 }
@@ -16,13 +16,10 @@
  */
 class ButtonTypeTest extends BaseTypeTest
 {
-    public function testCreateButtonInstances()
-    {
-        $this->assertInstanceOf('Symfony\Component\Form\Button', $this->factory->create('button'));
-    }
+    const TESTED_TYPE = 'button';
 
-    protected function getTestedType()
+    public function testCreateButtonInstances()
     {
-        return 'button';
+        $this->assertInstanceOf('Symfony\Component\Form\Button', $this->factory->create(static::TESTED_TYPE));
     }
 }
@@ -12,13 +12,14 @@
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
 use Symfony\Component\Form\CallbackTransformer;
-use Symfony\Component\Form\Test\TypeTestCase;
 
-class CheckboxTypeTest extends TypeTestCase
+class CheckboxTypeTest extends BaseTypeTest
 {
+    const TESTED_TYPE = 'checkbox';
+
     public function testDataIsFalseByDefault()
     {
-        $form = $this->factory->create('checkbox');
+        $form = $this->factory->create(static::TESTED_TYPE);
 
         $this->assertFalse($form->getData());
         $this->assertFalse($form->getNormData());
@@ -27,42 +28,42 @@ public function testDataIsFalseByDefault()
 
     public function testPassValueToView()
     {
-        $form = $this->factory->create('checkbox', null, array('value' => 'foobar'));
-        $view = $form->createView();
+        $view = $this->factory->create(static::TESTED_TYPE, null, array('value' => 'foobar'))
+            ->createView();
 
         $this->assertEquals('foobar', $view->vars['value']);
     }
 
     public function testCheckedIfDataTrue()
     {
-        $form = $this->factory->create('checkbox');
-        $form->setData(true);
-        $view = $form->createView();
+        $view = $this->factory->create(static::TESTED_TYPE)
+            ->setData(true)
+            ->createView();
 
         $this->assertTrue($view->vars['checked']);
     }
 
     public function testCheckedIfDataTrueWithEmptyValue()
     {
-        $form = $this->factory->create('checkbox', null, array('value' => ''));
-        $form->setData(true);
-        $view = $form->createView();
+        $view = $this->factory->create(static::TESTED_TYPE, null, array('value' => ''))
+            ->setData(true)
+            ->createView();
 
         $this->assertTrue($view->vars['checked']);
     }
 
     public function testNotCheckedIfDataFalse()
     {
-        $form = $this->factory->create('checkbox');
-        $form->setData(false);
-        $view = $form->createView();
+        $view = $this->factory->create(static::TESTED_TYPE)
+            ->setData(false)
+            ->createView();
 
         $this->assertFalse($view->vars['checked']);
     }
 
     public function testSubmitWithValueChecked()
     {
-        $form = $this->factory->create('checkbox', null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, array(
             'value' => 'foobar',
         ));
         $form->submit('foobar');
@@ -73,7 +74,7 @@ public function testSubmitWithValueChecked()
 
     public function testSubmitWithRandomValueChecked()
     {
-        $form = $this->factory->create('checkbox', null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, array(
             'value' => 'foobar',
         ));
         $form->submit('krixikraxi');
@@ -84,7 +85,7 @@ public function testSubmitWithRandomValueChecked()
 
     public function testSubmitWithValueUnchecked()
     {
-        $form = $this->factory->create('checkbox', null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, array(
             'value' => 'foobar',
         ));
         $form->submit(null);
@@ -95,7 +96,7 @@ public function testSubmitWithValueUnchecked()
 
     public function testSubmitWithEmptyValueChecked()
     {
-        $form = $this->factory->create('checkbox', null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, array(
             'value' => '',
         ));
         $form->submit('');
@@ -106,7 +107,7 @@ public function testSubmitWithEmptyValueChecked()
 
     public function testSubmitWithEmptyValueUnchecked()
     {
-        $form = $this->factory->create('checkbox', null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, array(
             'value' => '',
         ));
         $form->submit(null);
@@ -117,7 +118,7 @@ public function testSubmitWithEmptyValueUnchecked()
 
     public function testSubmitWithEmptyValueAndFalseUnchecked()
     {
-        $form = $this->factory->create('checkbox', null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, array(
             'value' => '',
         ));
         $form->submit(false);
@@ -128,7 +129,7 @@ public function testSubmitWithEmptyValueAndFalseUnchecked()
 
     public function testSubmitWithEmptyValueAndTrueChecked()
     {
-        $form = $this->factory->create('checkbox', null, array(
+        $form = $this->factory->create(static::TESTED_TYPE, null, array(
             'value' => '',
         ));
         $form->submit(true);
@@ -152,7 +153,7 @@ function ($value) {
             }
         );
 
-        $form = $this->factory->createBuilder('checkbox')
+        $form = $this->factory->createBuilder(static::TESTED_TYPE)
             ->addModelTransformer($transformer)
             ->getForm();
 
@@ -171,4 +172,9 @@ public function provideCustomModelTransformerData()
             array('unchecked', false),
         );
     }
+
+    public function testSubmitNull($expected = null, $norm = null, $view = null)
+    {
+        parent::testSubmitNull(false, false, null);
+    }
 }
Original file line number	Diff line number	Diff line change
`@@ -16,13 +16,10 @@`
`16`	`16`	`*/`
`17`	`17`	`class ButtonTypeTest extends BaseTypeTest`
`18`	`18`	`{`
`19`		`- public function testCreateButtonInstances()`
`20`		`- {`
`21`		`- $this->assertInstanceOf('Symfony\Component\Form\Button', $this->factory->create('button'));`
`22`		`- }`
	`19`	`+ const TESTED_TYPE = 'button';`
`23`	`20`
`24`		`- protected function getTestedType()`
	`21`	`+ public function testCreateButtonInstances()`
`25`	`22`	`{`
`26`		`- return 'button';`
	`23`	`+ $this->assertInstanceOf('Symfony\Component\Form\Button', $this->factory->create(static::TESTED_TYPE));`
`27`	`24`	`}`
`28`	`25`	`}`