diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-11-03 09:51:49 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-11-03 09:51:49 -0800 |
| commit | 7288e1b02b2504b1694fe14df2d81e6a354c5610 (patch) | |
| tree | a4bb2a34ffc03d4939c6d8f961bddc1918b8fd9c /tests/forms_tests | |
| parent | 91078f566904e49fbf99ec6375ba627e821f6143 (diff) | |
| parent | 4f151da1e5e9bf527548a5737d9cd314e3abc68e (diff) | |
Merge pull request #1852 from jasonamyers/cleanup/PEP8
Cleanup/pep8 tests
Diffstat (limited to 'tests/forms_tests')
| -rw-r--r-- | tests/forms_tests/models.py | 5 | ||||
| -rw-r--r-- | tests/forms_tests/tests/test_error_messages.py | 1 | ||||
| -rw-r--r-- | tests/forms_tests/tests/test_extra.py | 3 | ||||
| -rw-r--r-- | tests/forms_tests/tests/test_formsets.py | 6 | ||||
| -rw-r--r-- | tests/forms_tests/tests/test_input_formats.py | 2 | ||||
| -rw-r--r-- | tests/forms_tests/tests/test_widgets.py | 4 | ||||
| -rw-r--r-- | tests/forms_tests/tests/tests.py | 1 |
7 files changed, 19 insertions, 3 deletions
diff --git a/tests/forms_tests/models.py b/tests/forms_tests/models.py index 33898ffbb8..8ade923a91 100644 --- a/tests/forms_tests/models.py +++ b/tests/forms_tests/models.py @@ -19,6 +19,8 @@ class BoundaryModel(models.Model): callable_default_value = 0 + + def callable_default(): global callable_default_value callable_default_value = callable_default_value + 1 @@ -27,7 +29,7 @@ def callable_default(): class Defaults(models.Model): name = models.CharField(max_length=255, default='class default value') - def_date = models.DateField(default = datetime.date(1980, 1, 1)) + def_date = models.DateField(default=datetime.date(1980, 1, 1)) value = models.IntegerField(default=42) callable_default = models.IntegerField(default=callable_default) @@ -86,6 +88,7 @@ class ChoiceFieldModel(models.Model): multi_choice_int = models.ManyToManyField(ChoiceOptionModel, blank=False, related_name='multi_choice_int', default=lambda: [1]) + class OptionalMultiChoiceModel(models.Model): multi_choice = models.ManyToManyField(ChoiceOptionModel, blank=False, related_name='not_relevant', default=lambda: ChoiceOptionModel.objects.filter(name='default')) diff --git a/tests/forms_tests/tests/test_error_messages.py b/tests/forms_tests/tests/test_error_messages.py index 2d532c7cf9..86f26df3bc 100644 --- a/tests/forms_tests/tests/test_error_messages.py +++ b/tests/forms_tests/tests/test_error_messages.py @@ -24,6 +24,7 @@ class AssertFormErrorsMixin(object): except ValidationError as e: self.assertEqual(e.messages, expected) + class FormsErrorMessagesTestCase(TestCase, AssertFormErrorsMixin): def test_charfield(self): e = { diff --git a/tests/forms_tests/tests/test_extra.py b/tests/forms_tests/tests/test_extra.py index 183b5dabdf..4585a4e6ef 100644 --- a/tests/forms_tests/tests/test_extra.py +++ b/tests/forms_tests/tests/test_extra.py @@ -25,12 +25,15 @@ from .test_error_messages import AssertFormErrorsMixin class GetDate(Form): mydate = DateField(widget=SelectDateWidget) + class GetNotRequiredDate(Form): mydate = DateField(widget=SelectDateWidget, required=False) + class GetDateShowHiddenInitial(Form): mydate = DateField(widget=SelectDateWidget, show_hidden_initial=True) + class FormsExtraTestCase(TestCase, AssertFormErrorsMixin): ############### # Extra stuff # diff --git a/tests/forms_tests/tests/test_formsets.py b/tests/forms_tests/tests/test_formsets.py index cf721b5510..52dfdf4044 100644 --- a/tests/forms_tests/tests/test_formsets.py +++ b/tests/forms_tests/tests/test_formsets.py @@ -57,7 +57,7 @@ SplitDateTimeFormSet = formset_factory(SplitDateTimeForm) class FormsFormsetTestCase(TestCase): def make_choiceformset(self, formset_data=None, formset_class=ChoiceFormSet, - total_forms=None, initial_forms=0, max_num_forms=0, min_num_forms=0, **kwargs): + total_forms=None, initial_forms=0, max_num_forms=0, min_num_forms=0, **kwargs): """ Make a ChoiceFormset from the given formset_data. The data should be given as a list of (choice, votes) tuples. @@ -1097,12 +1097,14 @@ data = { 'choices-0-votes': '100', } + class Choice(Form): choice = CharField() votes = IntegerField() ChoiceFormSet = formset_factory(Choice) + class FormsetAsFooTests(TestCase): def test_as_table(self): formset = ChoiceFormSet(data, auto_id=False, prefix='choices') @@ -1130,6 +1132,7 @@ class ArticleForm(Form): ArticleFormSet = formset_factory(ArticleForm) + class TestIsBoundBehavior(TestCase): def test_no_data_raises_validation_error(self): with self.assertRaises(ValidationError): @@ -1184,6 +1187,7 @@ class TestIsBoundBehavior(TestCase): # The empty forms should be equal. self.assertHTMLEqual(empty_forms[0].as_p(), empty_forms[1].as_p()) + class TestEmptyFormSet(TestCase): def test_empty_formset_is_valid(self): """Test that an empty formset still calls clean()""" diff --git a/tests/forms_tests/tests/test_input_formats.py b/tests/forms_tests/tests/test_input_formats.py index 25b491a499..b9c29c7609 100644 --- a/tests/forms_tests/tests/test_input_formats.py +++ b/tests/forms_tests/tests/test_input_formats.py @@ -490,6 +490,7 @@ class CustomDateInputFormatsTests(SimpleTestCase): text = f.widget._format_value(result) self.assertEqual(text, "21.12.2010") + class SimpleDateFormatTests(SimpleTestCase): def test_dateField(self): "DateFields can parse dates in the default format" @@ -776,6 +777,7 @@ class CustomDateTimeInputFormatsTests(SimpleTestCase): text = f.widget._format_value(result) self.assertEqual(text, "01:30:00 PM 21/12/2010") + class SimpleDateTimeFormatTests(SimpleTestCase): def test_dateTimeField(self): "DateTimeFields can parse dates in the default format" diff --git a/tests/forms_tests/tests/test_widgets.py b/tests/forms_tests/tests/test_widgets.py index c601a3ad58..21134d1a24 100644 --- a/tests/forms_tests/tests/test_widgets.py +++ b/tests/forms_tests/tests/test_widgets.py @@ -286,7 +286,7 @@ class FormsWidgetTestCase(TestCase): things = ({'id': 1, 'name': 'And Boom'}, {'id': 2, 'name': 'One More Thing!'}) class SomeForm(Form): - somechoice = ChoiceField(choices=chain((('', '-'*9),), [(thing['id'], thing['name']) for thing in things])) + somechoice = ChoiceField(choices=chain((('', '-' * 9),), [(thing['id'], thing['name']) for thing in things])) f = SomeForm() self.assertHTMLEqual(f.as_table(), '<tr><th><label for="id_somechoice">Somechoice:</label></th><td><select name="somechoice" id="id_somechoice">\n<option value="" selected="selected">---------</option>\n<option value="1">And Boom</option>\n<option value="2">One More Thing!</option>\n</select></td></tr>') self.assertHTMLEqual(f.as_table(), '<tr><th><label for="id_somechoice">Somechoice:</label></th><td><select name="somechoice" id="id_somechoice">\n<option value="" selected="selected">---------</option>\n<option value="1">And Boom</option>\n<option value="2">One More Thing!</option>\n</select></td></tr>') @@ -1003,6 +1003,7 @@ class NullBooleanSelectLazyForm(Form): """Form to test for lazy evaluation. Refs #17190""" bool = BooleanField(widget=NullBooleanSelect()) + @override_settings(USE_L10N=True) class FormsI18NWidgetsTestCase(TestCase): def setUp(self): @@ -1136,6 +1137,7 @@ class FakeFieldFile(object): def __str__(self): return self.url + class ClearableFileInputTests(TestCase): def test_clear_input_renders(self): """ diff --git a/tests/forms_tests/tests/tests.py b/tests/forms_tests/tests/tests.py index 8212d4ee5c..622b6386e9 100644 --- a/tests/forms_tests/tests/tests.py +++ b/tests/forms_tests/tests/tests.py @@ -217,6 +217,7 @@ class FormsModelTestCase(TestCase): self.assertEqual(obj.value, 99) self.assertEqual(obj.def_date, datetime.date(1999, 3, 2)) + class RelatedModelFormTests(TestCase): def test_invalid_loading_order(self): """ |
