diff options
Diffstat (limited to 'djangorestframework/tests/validators.py')
| -rw-r--r-- | djangorestframework/tests/validators.py | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/djangorestframework/tests/validators.py b/djangorestframework/tests/validators.py index a1e5d2d7..1f696422 100644 --- a/djangorestframework/tests/validators.py +++ b/djangorestframework/tests/validators.py @@ -22,7 +22,7 @@ class TestDisabledValidations(TestCase): resource = DisabledFormResource view = MockView() - content = {'qwerty':'uiop'} + content = {'qwerty':'uiop'} self.assertEqual(FormResource(view).validate_request(content, None), content) def test_disabled_form_validator_get_bound_form_returns_none(self): @@ -33,12 +33,12 @@ class TestDisabledValidations(TestCase): class MockView(View): resource = DisabledFormResource - + view = MockView() - content = {'qwerty':'uiop'} + content = {'qwerty':'uiop'} self.assertEqual(FormResource(view).get_bound_form(content), None) - + def test_disabled_model_form_validator_returns_content_unchanged(self): """If the view's form is None and does not have a Resource with a model set then ModelFormValidator(view).validate_request(content, None) should just return the content unmodified.""" @@ -47,17 +47,17 @@ class TestDisabledValidations(TestCase): resource = ModelResource view = DisabledModelFormView() - content = {'qwerty':'uiop'} + content = {'qwerty':'uiop'} self.assertEqual(ModelResource(view).get_bound_form(content), None)# def test_disabled_model_form_validator_get_bound_form_returns_none(self): """If the form attribute is None on FormValidatorMixin then get_bound_form(content) should just return None.""" class DisabledModelFormView(View): resource = ModelResource - + view = DisabledModelFormView() - content = {'qwerty':'uiop'} - self.assertEqual(ModelResource(view).get_bound_form(content), None) + content = {'qwerty':'uiop'} + self.assertEqual(ModelResource(view).get_bound_form(content), None) class TestNonFieldErrors(TestCase): """Tests against form validation errors caused by non-field errors. (eg as might be caused by some custom form validation)""" @@ -68,15 +68,15 @@ class TestNonFieldErrors(TestCase): field1 = forms.CharField(required=False) field2 = forms.CharField(required=False) ERROR_TEXT = 'You may not supply both field1 and field2' - + def clean(self): if 'field1' in self.cleaned_data and 'field2' in self.cleaned_data: raise forms.ValidationError(self.ERROR_TEXT) return self.cleaned_data #pragma: no cover - + class MockResource(FormResource): form = MockForm - + class MockView(View): pass @@ -84,7 +84,7 @@ class TestNonFieldErrors(TestCase): content = {'field1': 'example1', 'field2': 'example2'} try: MockResource(view).validate_request(content, None) - except ErrorResponse, exc: + except ErrorResponse, exc: self.assertEqual(exc.response.raw_content, {'errors': [MockForm.ERROR_TEXT]}) else: self.fail('ErrorResponse was not raised') #pragma: no cover @@ -94,26 +94,26 @@ class TestFormValidation(TestCase): """Tests which check basic form validation. Also includes the same set of tests with a ModelFormValidator for which the form has been explicitly set. (ModelFormValidator should behave as FormValidator if a form is set rather than relying on the default ModelForm)""" - def setUp(self): + def setUp(self): class MockForm(forms.Form): qwerty = forms.CharField(required=True) class MockFormResource(FormResource): form = MockForm - + class MockModelResource(ModelResource): form = MockForm - + class MockFormView(View): resource = MockFormResource - + class MockModelFormView(View): resource = MockModelResource self.MockFormResource = MockFormResource - self.MockModelResource = MockModelResource + self.MockModelResource = MockModelResource self.MockFormView = MockFormView - self.MockModelFormView = MockModelFormView + self.MockModelFormView = MockModelFormView def validation_returns_content_unchanged_if_already_valid_and_clean(self, validator): @@ -130,22 +130,22 @@ class TestFormValidation(TestCase): """If some (otherwise valid) content includes fields that are not in the form then validation should fail. It might be okay on normal form submission, but for Web APIs we oughta get strict, as it'll help show up broken clients more easily (eg submitting content with a misnamed field)""" - content = {'qwerty': 'uiop', 'extra': 'extra'} + content = {'qwerty': 'uiop', 'extra': 'extra'} self.assertRaises(ErrorResponse, validator.validate_request, content, None) def validation_allows_extra_fields_if_explicitly_set(self, validator): """If we include an allowed_extra_fields paramater on _validate, then allow fields with those names.""" - content = {'qwerty': 'uiop', 'extra': 'extra'} + content = {'qwerty': 'uiop', 'extra': 'extra'} validator._validate(content, None, allowed_extra_fields=('extra',)) def validation_does_not_require_extra_fields_if_explicitly_set(self, validator): """If we include an allowed_extra_fields paramater on _validate, then do not fail if we do not have fields with those names.""" - content = {'qwerty': 'uiop'} + content = {'qwerty': 'uiop'} self.assertEqual(validator._validate(content, None, allowed_extra_fields=('extra',)), content) def validation_failed_due_to_no_content_returns_appropriate_message(self, validator): """If validation fails due to no content, ensure the response contains a single non-field error""" - content = {} + content = {} try: validator.validate_request(content, None) except ErrorResponse, exc: @@ -158,7 +158,7 @@ class TestFormValidation(TestCase): content = {'qwerty': ''} try: validator.validate_request(content, None) - except ErrorResponse, exc: + except ErrorResponse, exc: self.assertEqual(exc.response.raw_content, {'field-errors': {'qwerty': ['This field is required.']}}) else: self.fail('ResourceException was not raised') #pragma: no cover @@ -168,17 +168,17 @@ class TestFormValidation(TestCase): content = {'qwerty': 'uiop', 'extra': 'extra'} try: validator.validate_request(content, None) - except ErrorResponse, exc: + except ErrorResponse, exc: self.assertEqual(exc.response.raw_content, {'field-errors': {'extra': ['This field does not exist.']}}) else: self.fail('ResourceException was not raised') #pragma: no cover - + def validation_failed_due_to_multiple_errors_returns_appropriate_message(self, validator): """If validation for multiple reasons, ensure the response contains each error""" content = {'qwerty': '', 'extra': 'extra'} try: validator.validate_request(content, None) - except ErrorResponse, exc: + except ErrorResponse, exc: self.assertEqual(exc.response.raw_content, {'field-errors': {'qwerty': ['This field is required.'], 'extra': ['This field does not exist.']}}) else: @@ -263,23 +263,23 @@ class TestFormValidation(TestCase): class TestModelFormValidator(TestCase): """Tests specific to ModelFormValidatorMixin""" - + def setUp(self): - """Create a validator for a model with two fields and a property.""" + """Create a validator for a model with two fields and a property.""" class MockModel(models.Model): qwerty = models.CharField(max_length=256) uiop = models.CharField(max_length=256, blank=True) - + @property def readonly(self): return 'read only' - + class MockResource(ModelResource): model = MockModel - + class MockView(View): resource = MockResource - + self.validator = MockResource(MockView) @@ -299,19 +299,19 @@ class TestModelFormValidator(TestCase): broken clients more easily (eg submitting content with a misnamed field)""" content = {'qwerty': 'example', 'uiop':'example', 'readonly': 'read only', 'extra': 'extra'} self.assertRaises(ErrorResponse, self.validator.validate_request, content, None) - + def test_validate_requires_fields_on_model_forms(self): """If some (otherwise valid) content includes fields that are not in the form then validation should fail. It might be okay on normal form submission, but for Web APIs we oughta get strict, as it'll help show up broken clients more easily (eg submitting content with a misnamed field)""" - content = {'readonly': 'read only'} + content = {'readonly': 'read only'} self.assertRaises(ErrorResponse, self.validator.validate_request, content, None) - + def test_validate_does_not_require_blankable_fields_on_model_forms(self): """Test standard ModelForm validation behaviour - fields with blank=True are not required.""" content = {'qwerty':'example', 'readonly': 'read only'} self.validator.validate_request(content, None) - + def test_model_form_validator_uses_model_forms(self): self.assertTrue(isinstance(self.validator.get_bound_form(), forms.ModelForm)) |