[Form] add test for ArrayChoiceList handling null

Tobion · Tobion · commit 00e38198b785 · 2016-02-18T14:16:01.000+01:00
diff --git a/src/Symfony/Component/Form/Tests/ChoiceList/AbstractChoiceListTest.php b/src/Symfony/Component/Form/Tests/ChoiceList/AbstractChoiceListTest.php
@@ -209,6 +209,13 @@ public function testGetValuesForChoicesEmpty()
         $this->assertSame(array(), $this->list->getValuesForChoices(array()));
     }
 
+    public function testGetChoicesForValuesWithNull()
+    {
+        $values = $this->list->getValuesForChoices(array(null));
+
+        $this->assertNotEmpty($this->list->getChoicesForValues($values));
+    }
+
     /**
      * @return \Symfony\Component\Form\ChoiceList\ChoiceListInterface
      */
diff --git a/src/Symfony/Component/Form/Tests/ChoiceList/ArrayChoiceListTest.php b/src/Symfony/Component/Form/Tests/ChoiceList/ArrayChoiceListTest.php
@@ -22,9 +22,9 @@ class ArrayChoiceListTest extends AbstractChoiceListTest
 
     protected function setUp()
     {
-        parent::setUp();
-
         $this->object = new \stdClass();
+
+        parent::setUp();
     }
 
     protected function createChoiceList()
@@ -34,12 +34,12 @@ protected function createChoiceList()
 
     protected function getChoices()
     {
-        return array(0, 1, '1', 'a', false, true, $this->object);
+        return array(0, 1, '1', 'a', false, true, $this->object, null);
     }
 
     protected function getValues()
     {
-        return array('0', '1', '2', '3', '4', '5', '6');
+        return array('0', '1', '2', '3', '4', '5', '6', '7');
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,9 @@ class ArrayChoiceListTest extends AbstractChoiceListTest`
`22`	`22`
`23`	`23`	`protected function setUp()`
`24`	`24`	`{`
`25`		`- parent::setUp();`
`26`		`-`
`27`	`25`	`$this->object = new \stdClass();`
	`26`	`+`
	`27`	`+ parent::setUp();`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`protected function createChoiceList()`
`@@ -34,12 +34,12 @@ protected function createChoiceList()`
`34`	`34`
`35`	`35`	`protected function getChoices()`
`36`	`36`	`{`
`37`		`- return array(0, 1, '1', 'a', false, true, $this->object);`
	`37`	`+ return array(0, 1, '1', 'a', false, true, $this->object, null);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`protected function getValues()`
`41`	`41`	`{`
`42`		`- return array('0', '1', '2', '3', '4', '5', '6');`
	`42`	`+ return array('0', '1', '2', '3', '4', '5', '6', '7');`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`/**`