Refs #15667 -- Removed choices argument from some RendererMixin methods.

RendererMixin will soon be removed but this removal and the corresponding
test changes stand on their own.

2 files changed, 15 insertions, 16 deletions

diff --git a/tests/forms_tests/widget_tests/test_checkboxselectmultiple.py b/tests/forms_tests/widget_tests/test_checkboxselectmultiple.py
index 9e594fba37..1e9d31e6a7 100644
--- a/tests/forms_tests/widget_tests/test_checkboxselectmultiple.py
+++ b/tests/forms_tests/widget_tests/test_checkboxselectmultiple.py
@@ -4,10 +4,10 @@ from .base import WidgetTest
 
 
 class CheckboxSelectMultipleTest(WidgetTest):
-    widget = CheckboxSelectMultiple()
+    widget = CheckboxSelectMultiple
 
     def test_render_value(self):
-        self.check_html(self.widget, 'beatles', ['J'], choices=self.beatles, html=(
+        self.check_html(self.widget(choices=self.beatles), 'beatles', ['J'], html=(
             """<ul>
             <li><label><input checked="checked" type="checkbox" name="beatles" value="J" /> John</label></li>
             <li><label><input type="checkbox" name="beatles" value="P" /> Paul</label></li>
@@ -17,7 +17,7 @@ class CheckboxSelectMultipleTest(WidgetTest):
         ))
 
     def test_render_value_multiple(self):
-        self.check_html(self.widget, 'beatles', ['J', 'P'], choices=self.beatles, html=(
+        self.check_html(self.widget(choices=self.beatles), 'beatles', ['J', 'P'], html=(
             """<ul>
             <li><label><input checked="checked" type="checkbox" name="beatles" value="J" /> John</label></li>
             <li><label><input checked="checked" type="checkbox" name="beatles" value="P" /> Paul</label></li>
@@ -30,7 +30,7 @@ class CheckboxSelectMultipleTest(WidgetTest):
         """
         If the value is None, none of the options are selected.
         """
-        self.check_html(self.widget, 'beatles', None, choices=self.beatles, html=(
+        self.check_html(self.widget(choices=self.beatles), 'beatles', None, html=(
             """<ul>
             <li><label><input type="checkbox" name="beatles" value="J" /> John</label></li>
             <li><label><input type="checkbox" name="beatles" value="P" /> Paul</label></li>
@@ -73,8 +73,8 @@ class CheckboxSelectMultipleTest(WidgetTest):
         </ul>
         """
         self.check_html(
-            self.widget, 'nestchoice', ('vinyl', 'dvd'),
-            choices=nested_choices, attrs={'id': 'media'}, html=html,
+            self.widget(choices=nested_choices), 'nestchoice', ('vinyl', 'dvd'),
+            attrs={'id': 'media'}, html=html,
         )
 
     def test_separate_ids(self):
@@ -93,14 +93,13 @@ class CheckboxSelectMultipleTest(WidgetTest):
         </li>
         </ul>
         """
-        self.check_html(self.widget, 'letters', ['a', 'c'], choices=choices, attrs={'id': 'abc'}, html=html)
+        self.check_html(self.widget(choices=choices), 'letters', ['a', 'c'], attrs={'id': 'abc'}, html=html)
 
     def test_separate_ids_constructor(self):
         """
         Each input gets a separate ID when the ID is passed to the constructor.
         """
-        widget = CheckboxSelectMultiple(attrs={'id': 'abc'})
-        choices = [('a', 'A'), ('b', 'B'), ('c', 'C')]
+        widget = CheckboxSelectMultiple(attrs={'id': 'abc'}, choices=[('a', 'A'), ('b', 'B'), ('c', 'C')])
         html = """
         <ul id="abc">
         <li>
@@ -112,4 +111,4 @@ class CheckboxSelectMultipleTest(WidgetTest):
         </li>
         </ul>
         """
-        self.check_html(widget, 'letters', ['a', 'c'], choices=choices, html=html)
+        self.check_html(widget, 'letters', ['a', 'c'], html=html)
diff --git a/tests/forms_tests/widget_tests/test_radioselect.py b/tests/forms_tests/widget_tests/test_radioselect.py
index e37dcf7725..cdb9420b15 100644
--- a/tests/forms_tests/widget_tests/test_radioselect.py
+++ b/tests/forms_tests/widget_tests/test_radioselect.py
@@ -4,10 +4,10 @@ from .base import WidgetTest
 
 
 class RadioSelectTest(WidgetTest):
-    widget = RadioSelect()
+    widget = RadioSelect
 
     def test_render(self):
-        self.check_html(self.widget, 'beatle', 'J', choices=self.beatles, html=(
+        self.check_html(self.widget(choices=self.beatles), 'beatle', 'J', html=(
             """<ul>
             <li><label><input checked="checked" type="radio" name="beatle" value="J" /> John</label></li>
             <li><label><input type="radio" name="beatle" value="P" /> Paul</label></li>
@@ -44,7 +44,7 @@ class RadioSelectTest(WidgetTest):
         </ul>
         """
         self.check_html(
-            self.widget, 'nestchoice', 'dvd', choices=nested_choices,
+            self.widget(choices=nested_choices), 'nestchoice', 'dvd',
             attrs={'id': 'media'}, html=html,
         )
 
@@ -53,7 +53,7 @@ class RadioSelectTest(WidgetTest):
         Attributes provided at instantiation are passed to the constituent
         inputs.
         """
-        widget = RadioSelect(attrs={'id': 'foo'})
+        widget = RadioSelect(attrs={'id': 'foo'}, choices=self.beatles)
         html = """
         <ul id="foo">
         <li>
@@ -64,7 +64,7 @@ class RadioSelectTest(WidgetTest):
         <li><label for="foo_3"><input type="radio" id="foo_3" value="R" name="beatle" /> Ringo</label></li>
         </ul>
         """
-        self.check_html(widget, 'beatle', 'J', choices=self.beatles, html=html)
+        self.check_html(widget, 'beatle', 'J', html=html)
 
     def test_render_attrs(self):
         """
@@ -81,4 +81,4 @@ class RadioSelectTest(WidgetTest):
         <li><label for="bar_3"><input type="radio" id="bar_3" value="R" name="beatle" /> Ringo</label></li>
         </ul>
         """
-        self.check_html(self.widget, 'beatle', 'J', choices=self.beatles, attrs={'id': 'bar'}, html=html)
+        self.check_html(self.widget(choices=self.beatles), 'beatle', 'J', attrs={'id': 'bar'}, html=html)