[Form] Tests for Renderer Plugins

src/Symfony/Component/Form/Renderer/Plugin/EnctypePlugin.php

@@ -1,23 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license infieldation, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Form\Renderer\Plugin;
-
-use Symfony\Component\Form\FormInterface;
-use Symfony\Component\Form\Renderer\FormRendererInterface;
-
-class EnctypePlugin implements FormRendererPluginInterface
-{
-    public function setUp(FormInterface $field, FormRendererInterface $renderer)
-    {
-        $renderer->setVar('enctype', $field->isMultipart() ? 'enctype="multipart/form-data"' : '');
-    }
-}

tests/Symfony/Tests/Component/Form/Renderer/Plugin/CheckedPluginTest.php

@@ -13,41 +13,39 @@ namespace Symfony\Tests\Component\Form\Renderer\Plugin;
 
 use Symfony\Component\Form\Renderer\Plugin\CheckedPlugin;
 
-use Symfony\Component\Form\Renderer\DefaultRenderer;
-use Symfony\Component\Form\FieldInterface;
-
 class CheckedPluginTest extends \PHPUnit_Framework_TestCase
 {
 
     public function testSetUpTrue()
     {
-        $field = $this->getMock('Symfony\Component\Form\FieldInterface');
-        $field->expects($this->any())
+        $field = $this->getMock('Symfony\Tests\Component\Form\FormInterface');
+        $field->expects($this->once())
               ->method('getData')
               ->will($this->returnValue(1));
-
-        $renderer = $this->getMock('Symfony\Component\Form\Renderer\RendererInterface');
+        
+        $renderer = $this->getMock('Symfony\Component\Form\Renderer\FormRendererInterface');
         $renderer->expects($this->once())
                 ->method('setVar')
                 ->with($this->equalTo('checked'), $this->equalTo(true));
 
-        $plugin = new CheckedPlugin($field);
-        $plugin->setUp($renderer);
+        $plugin = new CheckedPlugin();
+        $plugin->setUp($field, $renderer);
     }
 
     public function testSetUpFalse()
     {
-        $field = $this->getMock('Symfony\Component\Form\FieldInterface');
-        $field->expects($this->any())
+        $field = $this->getMock('Symfony\Tests\Component\Form\FormInterface');
+        $field->expects($this->once())
               ->method('getData')
               ->will($this->returnValue(0));
 
-        $renderer = $this->getMock('Symfony\Component\Form\Renderer\RendererInterface');
+        $renderer = $this->getMock('Symfony\Component\Form\Renderer\FormRendererInterface');
         $renderer->expects($this->once())
                 ->method('setVar')
                 ->with($this->equalTo('checked'), $this->equalTo(false));
 
-        $plugin = new CheckedPlugin($field);
-        $plugin->setUp($renderer);
+        $plugin = new CheckedPlugin();
+        $plugin->setUp($field, $renderer);
     }
+    
 }

tests/Symfony/Tests/Component/Form/Renderer/Plugin/ChoicePluginTest.php

@@ -13,24 +13,22 @@ namespace Symfony\Tests\Component\Form\Renderer\Plugin;
 
 use Symfony\Component\Form\Renderer\Plugin\ChoicePlugin;
 
-use Symfony\Component\Form\Renderer\DefaultRenderer;
-use Symfony\Component\Form\ChoiceList\ChoiceListInterface;
-
 class ChoicePluginTest extends \PHPUnit_Framework_TestCase
 {
 
     public function testSetUp()
     {
-        $field = $this->getMock('Symfony\Component\Form\ChoiceList\ChoiceListInterface');
-        $field->expects($this->any())
+        $choice = $this->getMock('Symfony\Component\Form\ChoiceList\ChoiceListInterface');
+        $choice->expects($this->any())
               ->method('getOtherChoices')
               ->will($this->returnValue('somechoices'));
-        $field->expects($this->any())
+        $choice->expects($this->any())
               ->method('getPreferredChoices')
               ->will($this->returnValue('somethingelse'));
 
-
-        $renderer = $this->getMock('Symfony\Component\Form\Renderer\RendererInterface');
+        $field = $this->getMock('Symfony\Tests\Component\Form\FormInterface');
+        
+        $renderer = $this->getMock('Symfony\Component\Form\Renderer\FormRendererInterface');
 
         $renderer->expects($this->at(0))
                 ->method('setVar')
@@ -46,13 +44,13 @@ class ChoicePluginTest extends \PHPUnit_Framework_TestCase
 
         $renderer->expects($this->at(3))
                 ->method('setVar')
-                ->with($this->equalTo('choice_list'), $this->equalTo($field));
+                ->with($this->equalTo('choice_list'), $this->equalTo($choice));
 
         $renderer->expects($this->at(4))
                 ->method('setVar')
                 ->with($this->equalTo('empty_value'), $this->equalTo(''));
 
-        $plugin = new ChoicePlugin($field);
-        $plugin->setUp($renderer);
+        $plugin = new ChoicePlugin($choice);
+        $plugin->setUp($field, $renderer);
     }
 }

tests/Symfony/Tests/Component/Form/Renderer/Plugin/DatePatternPluginTest.php

@@ -13,9 +13,6 @@ namespace Symfony\Tests\Component\Form\Renderer\Plugin;
 
 use Symfony\Component\Form\Renderer\Plugin\DatePatternPlugin;
 
-use Symfony\Component\Form\Renderer\DefaultRenderer;
-use Symfony\Component\Form\FieldInterface;
-
 class DatePatternPluginTest extends \PHPUnit_Framework_TestCase
 {
 
@@ -24,13 +21,15 @@ class DatePatternPluginTest extends \PHPUnit_Framework_TestCase
 
         $intl = new \IntlDateFormatter("en_US" ,\IntlDateFormatter::SHORT, \IntlDateFormatter::NONE);
 
-        $renderer = $this->getMock('Symfony\Component\Form\Renderer\RendererInterface');
+        $field = $this->getMock('Symfony\Tests\Component\Form\FormInterface');
+        
+        $renderer = $this->getMock('Symfony\Component\Form\Renderer\FormRendererInterface');
 
         $renderer->expects($this->once())
                 ->method('setVar')
                 ->with($this->equalTo('date_pattern'), $this->equalTo('{{ month }}/{{ day }}/{{ year }}'));
         $plugin = new DatePatternPlugin($intl);
-        $plugin->setUp($renderer);
+        $plugin->setUp($field, $renderer);
     }
 
     public function testen_GB()
@@ -38,13 +37,15 @@ class DatePatternPluginTest extends \PHPUnit_Framework_TestCase
 
         $intl = new \IntlDateFormatter("en_GB" ,\IntlDateFormatter::SHORT, \IntlDateFormatter::NONE);
 
-        $renderer = $this->getMock('Symfony\Component\Form\Renderer\RendererInterface');
+        $field = $this->getMock('Symfony\Tests\Component\Form\FormInterface');
+
+        $renderer = $this->getMock('Symfony\Component\Form\Renderer\FormRendererInterface');
 
         $renderer->expects($this->once())
                 ->method('setVar')
                 ->with($this->equalTo('date_pattern'), $this->equalTo('{{ day }}/{{ month }}/{{ year }}'));
         $plugin = new DatePatternPlugin($intl);
-        $plugin->setUp($renderer);
+        $plugin->setUp($field, $renderer);
     }
 
     public function testde_DE()
@@ -52,13 +53,15 @@ class DatePatternPluginTest extends \PHPUnit_Framework_TestCase
 
         $intl = new \IntlDateFormatter("de_DE" ,\IntlDateFormatter::SHORT, \IntlDateFormatter::NONE);
 
-        $renderer = $this->getMock('Symfony\Component\Form\Renderer\RendererInterface');
+        $field = $this->getMock('Symfony\Tests\Component\Form\FormInterface');
+        
+        $renderer = $this->getMock('Symfony\Component\Form\Renderer\FormRendererInterface');
 
         $renderer->expects($this->once())
                 ->method('setVar')
                 ->with($this->equalTo('date_pattern'), $this->equalTo('{{ day }}.{{ month }}.{{ year }}'));
         $plugin = new DatePatternPlugin($intl);
-        $plugin->setUp($renderer);
+        $plugin->setUp($field, $renderer);
     }
 
     public function testDefault()
@@ -66,12 +69,14 @@ class DatePatternPluginTest extends \PHPUnit_Framework_TestCase
 
         $intl = new \IntlDateFormatter("de_DE" ,\IntlDateFormatter::SHORT, \IntlDateFormatter::SHORT);
 
-        $renderer = $this->getMock('Symfony\Component\Form\Renderer\RendererInterface');
+        $field = $this->getMock('Symfony\Tests\Component\Form\FormInterface');
+        
+        $renderer = $this->getMock('Symfony\Component\Form\Renderer\FormRendererInterface');
 
         $renderer->expects($this->once())
                 ->method('setVar')
                 ->with($this->equalTo('date_pattern'), $this->equalTo('{{ year }}-{{ month }}-{{ day }}'));
         $plugin = new DatePatternPlugin($intl);
-        $plugin->setUp($renderer);
+        $plugin->setUp($field, $renderer);
     }
 }

tests/Symfony/Tests/Component/Form/Renderer/Plugin/EnctypePluginTest.php

@@ -1,53 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien.potencier@symfony-project.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\Renderer\Plugin;
-
-use Symfony\Component\Form\Renderer\Plugin\EnctypePlugin;
-
-use Symfony\Component\Form\Renderer\DefaultRenderer;
-use Symfony\Component\Form\FieldInterface;
-
-class EnctypePluginTest extends \PHPUnit_Framework_TestCase
-{
-
-    public function testSetUpIsMultiPart()
-    {
-        $field = $this->getMock('Symfony\Component\Form\FieldInterface');
-        $field->expects($this->any())
-              ->method('isMultipart')
-              ->will($this->returnValue(true));
-
-        $renderer = $this->getMock('Symfony\Component\Form\Renderer\RendererInterface');
-        $renderer->expects($this->once())
-                ->method('setVar')
-                ->with($this->equalTo('enctype'), $this->equalTo('enctype="multipart/form-data"'));
-
-        $plugin = new EnctypePlugin($field);
-        $plugin->setUp($renderer);
-    }
-
-    public function testSetUpIsNotMultiPart()
-    {
-        $field = $this->getMock('Symfony\Component\Form\FieldInterface');
-        $field->expects($this->any())
-              ->method('isMultipart')
-              ->will($this->returnValue(false));
-
-        $renderer = $this->getMock('Symfony\Component\Form\Renderer\RendererInterface');
-        $renderer->expects($this->once())
-                ->method('setVar')
-                ->with($this->equalTo('enctype'), $this->equalTo(''));
-
-        $plugin = new EnctypePlugin($field);
-        $plugin->setUp($renderer);
-    }
-}

tests/Symfony/Tests/Component/Form/Renderer/Plugin/FieldPluginTest.php

@@ -13,17 +13,14 @@ namespace Symfony\Tests\Component\Form\Renderer\Plugin;
 
 use Symfony\Component\Form\Renderer\Plugin\FieldPlugin;
 
-use Symfony\Component\Form\Renderer\DefaultRenderer;
-use Symfony\Component\Form\FieldInterface;
-    
 class FieldPluginTest extends \PHPUnit_Framework_TestCase
 {
 
     public function testSetUp()
     {
-        $field = $this->getMock('Symfony\Component\Form\FieldInterface');
+        $field = $this->getMock('Symfony\Tests\Component\Form\FormInterface');
         $field->expects($this->any())
-              ->method('getDisplayedData')
+              ->method('getClientData')
               ->will($this->returnValue('bar'));
 
         $field->expects($this->any())
@@ -31,8 +28,8 @@ class FieldPluginTest extends \PHPUnit_Framework_TestCase
               ->will($this->returnValue(false));
 
         $field->expects($this->any())
-              ->method('getKey')
-              ->will($this->returnValue('The_Key'));
+              ->method('getName')
+              ->will($this->returnValue('The_Name'));
 
         $field->expects($this->any())
               ->method('getErrors')
@@ -47,19 +44,19 @@ class FieldPluginTest extends \PHPUnit_Framework_TestCase
               ->will($this->returnValue(true));
 
 
-        $renderer = $this->getMock('Symfony\Component\Form\Renderer\RendererInterface');
+        $renderer = $this->getMock('Symfony\Component\Form\Renderer\FormRendererInterface');
 
         $renderer->expects($this->at(0))
                 ->method('setVar')
-                ->with($this->equalTo('this'), $this->equalTo($renderer));
+                ->with($this->equalTo('renderer'), $this->equalTo($renderer));
 
         $renderer->expects($this->at(1))
                 ->method('setVar')
-                ->with($this->equalTo('id'), $this->equalTo('The_Key'));
+                ->with($this->equalTo('id'), $this->equalTo('The_Name'));
 
         $renderer->expects($this->at(2))
                 ->method('setVar')
-                ->with($this->equalTo('name'), $this->equalTo('The_Key'));
+                ->with($this->equalTo('name'), $this->equalTo('The_Name'));
 
         $renderer->expects($this->at(3))
                 ->method('setVar')
@@ -91,11 +88,11 @@ class FieldPluginTest extends \PHPUnit_Framework_TestCase
 
         $renderer->expects($this->at(10))
                 ->method('setVar')
-                ->with($this->equalTo('label'), $this->equalTo('The key'));
+                ->with($this->equalTo('label'), $this->equalTo('The name'));
         
 
-        $plugin = new FieldPlugin($field);
-        $plugin->setUp($renderer);
+        $plugin = new FieldPlugin();
+        $plugin->setUp($field, $renderer);
     }
 
 }

tests/Symfony/Tests/Component/Form/Renderer/Plugin/FormPluginTest.php

@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.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\Renderer\Plugin;
+
+use Symfony\Component\Form\Renderer\Plugin\FormPlugin;
+
+class FormPluginTest extends \PHPUnit_Framework_TestCase
+{
+
+    public function testSetUp()
+    {
+        $field = $this->getMock('Symfony\Tests\Component\Form\FormInterface');
+
+        $renderer = $this->getMock('Symfony\Component\Form\Renderer\FormRendererInterface');
+
+        $renderer->expects($this->at(0))
+                ->method('setVar')
+                ->with($this->equalTo('fields'), $this->equalTo(array()));
+
+        $renderer->expects($this->at(1))
+                ->method('setVar')
+                ->with($this->equalTo('multipart'), $this->equalTo(false));
+        
+
+        $plugin = new FormPlugin();
+        $plugin->setUp($field, $renderer);
+    }
+
+}

tests/Symfony/Tests/Component/Form/Renderer/Plugin/MaxLengthPluginTest.php

@@ -13,21 +13,20 @@ namespace Symfony\Tests\Component\Form\Renderer\Plugin;
 
 use Symfony\Component\Form\Renderer\Plugin\MaxLengthPlugin;
 
-use Symfony\Component\Form\Renderer\DefaultRenderer;
-use Symfony\Component\Form\FormInterface;
-
 class MaxLengthPluginTest extends \PHPUnit_Framework_TestCase
 {
 
     public function testSetUp()
     {
-        $renderer = $this->getMock('Symfony\Component\Form\Renderer\RendererInterface');
+        $field = $this->getMock('Symfony\Tests\Component\Form\FormInterface');
+        
+        $renderer = $this->getMock('Symfony\Component\Form\Renderer\FormRendererInterface');
         $renderer->expects($this->once())
                 ->method('setVar')
                 ->with($this->equalTo('max_length'), $this->equalTo(12));
 
         $plugin = new MaxLengthPlugin(12);
-        $plugin->setUp($renderer);
+        $plugin->setUp($field, $renderer);
 
     }
 }

tests/Symfony/Tests/Component/Form/Renderer/Plugin/MoneyPatternPluginTest.php

@@ -13,22 +13,20 @@ namespace Symfony\Tests\Component\Form\Renderer\Plugin;
 
 use Symfony\Component\Form\Renderer\Plugin\MoneyPatternPlugin;
 
-use Symfony\Component\Form\Renderer\DefaultRenderer;
-use Symfony\Component\Form\FieldInterface;
-
 class MoneyPatternPluginTest extends \PHPUnit_Framework_TestCase
 {
 
     public function testSetUpEur()
     {
+        $field = $this->getMock('Symfony\Tests\Component\Form\FormInterface');
         
-        $renderer = $this->getMock('Symfony\Component\Form\Renderer\RendererInterface');
+        $renderer = $this->getMock('Symfony\Component\Form\Renderer\FormRendererInterface');
         $renderer->expects($this->once())
                 ->method('setVar')
                 ->with($this->equalTo('money_pattern'), $this->equalTo('€ {{ widget }}'));
 
         $plugin = new MoneyPatternPlugin('EUR');
-        $plugin->setUp($renderer);
+        $plugin->setUp($field, $renderer);
     }
     
 }

tests/Symfony/Tests/Component/Form/Renderer/Plugin/ParentNamePluginTest.php

@@ -13,25 +13,22 @@ namespace Symfony\Tests\Component\Form\Renderer\Plugin;
 
 use Symfony\Component\Form\Renderer\Plugin\ParentNamePlugin;
 
-use Symfony\Component\Form\Renderer\DefaultRenderer;
-use Symfony\Component\Form\FieldInterface;
-
 class ParentNamePluginTest extends \PHPUnit_Framework_TestCase
 {
 
     public function testSetUpHasParent()
     {
-        $parentRenderer = $this->getMock('Symfony\Component\Form\Renderer\RendererInterface');
+        $parentRenderer = $this->getMock('Symfony\Component\Form\Renderer\FormRendererInterface');
         $parentRenderer->expects($this->once())
                 ->method('getVar')
                 ->will($this->returnValue("parentName"));
 
-        $parentField = $this->getMock('Symfony\Component\Form\FieldInterface');
+        $parentField = $this->getMock('Symfony\Tests\Component\Form\FormInterface');
         $parentField->expects($this->once())
               ->method('getRenderer')
               ->will($this->returnValue($parentRenderer));
 
-        $field = $this->getMock('Symfony\Component\Form\FieldInterface');
+        $field = $this->getMock('Symfony\Tests\Component\Form\FormInterface');
         $field->expects($this->once())
               ->method('getParent')
               ->will($this->returnValue($parentField));
@@ -40,19 +37,19 @@ class ParentNamePluginTest extends \PHPUnit_Framework_TestCase
               ->method('hasParent')
               ->will($this->returnValue(true));
 
-        $renderer = $this->getMock('Symfony\Component\Form\Renderer\RendererInterface');
+        $renderer = $this->getMock('Symfony\Component\Form\Renderer\FormRendererInterface');
         $renderer->expects($this->once())
                 ->method('setVar')
                 ->with($this->equalTo('name'), $this->equalTo('parentName'));
 
-        $plugin = new ParentNamePlugin($field);
-        $plugin->setUp($renderer);
+        $plugin = new ParentNamePlugin();
+        $plugin->setUp($field, $renderer);
     }
 
     public function testSetUpNoParent()
     {
         
-        $field = $this->getMock('Symfony\Component\Form\FieldInterface');
+        $field = $this->getMock('Symfony\Tests\Component\Form\FormInterface');
         $field->expects($this->never())
               ->method('getParent');
 
@@ -60,11 +57,11 @@ class ParentNamePluginTest extends \PHPUnit_Framework_TestCase
               ->method('hasParent')
               ->will($this->returnValue(false));
 
-        $renderer = $this->getMock('Symfony\Component\Form\Renderer\RendererInterface');
+        $renderer = $this->getMock('Symfony\Component\Form\Renderer\FormRendererInterface');
         $renderer->expects($this->never())
                 ->method('setVar');
 
-        $plugin = new ParentNamePlugin($field);
-        $plugin->setUp($renderer);
+        $plugin = new ParentNamePlugin();
+        $plugin->setUp($field, $renderer);
     }
 }

tests/Symfony/Tests/Component/Form/Renderer/Plugin/PasswordValuePluginTest.php

@@ -13,49 +13,46 @@ namespace Symfony\Tests\Component\Form\Renderer\Plugin;
 
 use Symfony\Component\Form\Renderer\Plugin\PasswordValuePlugin;
 
-use Symfony\Component\Form\Renderer\DefaultRenderer;
-use Symfony\Component\Form\FieldInterface;
-
 class PasswordValuePluginTest extends \PHPUnit_Framework_TestCase
 {
 
     public function testIsSubmittedSetUp()
     {
-        $field = $this->getMock('Symfony\Component\Form\FieldInterface');
+        $field = $this->getMock('Symfony\Tests\Component\Form\FormInterface');
         $field->expects($this->any())
-              ->method('getDisplayedData')
+              ->method('getClientData')
               ->will($this->returnValue('pAs5w0rd'));
 
         $field->expects($this->any())
-              ->method('isSubmitted')
+              ->method('isBound')
               ->will($this->returnValue(true));
 
-        $renderer = $this->getMock('Symfony\Component\Form\Renderer\RendererInterface');
+        $renderer = $this->getMock('Symfony\Component\Form\Renderer\FormRendererInterface');
         $renderer->expects($this->once())
                 ->method('setVar')
                 ->with($this->equalTo('value'), $this->equalTo('pAs5w0rd'));
 
-        $plugin = new PasswordValuePlugin($field,false);
-        $plugin->setUp($renderer);
+        $plugin = new PasswordValuePlugin(false);
+        $plugin->setUp($field, $renderer);
     }
 
     public function testIsNotSubmittedSetUp()
     {
-        $field = $this->getMock('Symfony\Component\Form\FieldInterface');
+        $field = $this->getMock('Symfony\Tests\Component\Form\FormInterface');
         $field->expects($this->any())
-              ->method('getDisplayedData')
+              ->method('getClientData')
               ->will($this->returnValue('pAs5w0rd'));
 
         $field->expects($this->any())
-              ->method('isSubmitted')
+              ->method('isBound')
               ->will($this->returnValue(false));
 
-        $renderer = $this->getMock('Symfony\Component\Form\Renderer\RendererInterface');
+        $renderer = $this->getMock('Symfony\Component\Form\Renderer\FormRendererInterface');
         $renderer->expects($this->once())
                 ->method('setVar')
                 ->with($this->equalTo('value'), $this->equalTo(''));
 
-        $plugin = new PasswordValuePlugin($field,false);
-        $plugin->setUp($renderer);
+        $plugin = new PasswordValuePlugin(false);
+        $plugin->setUp($field, $renderer);
     }
 }

tests/Symfony/Tests/Component/Form/Renderer/Plugin/SelectMultipleNamePluginTest.php

@@ -13,15 +13,14 @@ namespace Symfony\Tests\Component\Form\Renderer\Plugin;
 
 use Symfony\Component\Form\Renderer\Plugin\SelectMultipleNamePlugin;
 
-use Symfony\Component\Form\Renderer\DefaultRenderer;
-use Symfony\Component\Form\FieldInterface;
-
 class SelectMultipleNamePluginTest extends \PHPUnit_Framework_TestCase
 {
 
     public function testSetUp()
     {
-        $renderer = $this->getMock('Symfony\Component\Form\Renderer\RendererInterface');
+        $field = $this->getMock('Symfony\Tests\Component\Form\FormInterface');
+        
+        $renderer = $this->getMock('Symfony\Component\Form\Renderer\FormRendererInterface');
         $renderer->expects($this->once())
                 ->method('getVar')
                 ->with($this->equalTo('name'))
@@ -32,6 +31,6 @@ class SelectMultipleNamePluginTest extends \PHPUnit_Framework_TestCase
                 ->with($this->equalTo('name'), $this->equalTo('multiname[]'));
 
         $plugin = new SelectMultipleNamePlugin();
-        $plugin->setUp($renderer);
+        $plugin->setUp($field, $renderer);
     }
 }