merged branch newicz/form_remove_test_comment (PR #7054)

This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #7054).

Commits
-------

26b5b60 [Form] Remove unnecessary comment and change test name

Discussion
----------

[Form] Remove unnecessary comment and change test name

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | none
| License       | MIT
| Doc PR        | none

src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php

@@ -86,10 +86,7 @@ class ChoiceTypeTest extends TypeTestCase
         ));
     }
 
-    /**
-     * expectedException \Symfony\Component\Form\Exception\Exception
-     */
-    public function testEitherChoiceListOrChoicesMustBeSet()
+    public function testChoiceListAndChoicesCanBeEmpty()
     {
         $this->factory->create('choice', null, array(
         ));