[Form] add test for ArrayChoiceList handling null

Tobion · Tobion · commit ffac44168dc9 · 2016-02-17T20:31:02.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
@@ -18,13 +18,9 @@
  */
 class ArrayChoiceListTest extends AbstractChoiceListTest
 {
-    private $object;
-
     protected function setUp()
     {
         parent::setUp();
-
-        $this->object = new \stdClass();
     }
 
     protected function createChoiceList()
@@ -34,12 +30,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, new \stdClass(), 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
`@@ -18,13 +18,9 @@`
`18`	`18`	`*/`
`19`	`19`	`class ArrayChoiceListTest extends AbstractChoiceListTest`
`20`	`20`	`{`
`21`		`- private $object;`
`22`		`-`
`23`	`21`	`protected function setUp()`
`24`	`22`	`{`
`25`	`23`	`parent::setUp();`
`26`		`-`
`27`		`- $this->object = new \stdClass();`
`28`	`24`	`}`
`29`	`25`
`30`	`26`	`protected function createChoiceList()`
`@@ -34,12 +30,12 @@ protected function createChoiceList()`
`34`	`30`
`35`	`31`	`protected function getChoices()`
`36`	`32`	`{`
`37`		`- return array(0, 1, '1', 'a', false, true, $this->object);`
	`33`	`+ return array(0, 1, '1', 'a', false, true, new \stdClass(), null);`
`38`	`34`	`}`
`39`	`35`
`40`	`36`	`protected function getValues()`
`41`	`37`	`{`
`42`		`- return array('0', '1', '2', '3', '4', '5', '6');`
	`38`	`+ return array('0', '1', '2', '3', '4', '5', '6', '7');`
`43`	`39`	`}`
`44`	`40`
`45`	`41`	`/**`