diff --git a/smash/web/tests/forms/test_study_forms.py b/smash/web/tests/forms/test_study_forms.py index a150a83c181cee62dcf894648ed7d5bb797a0279..a6180017841b04dad385911f5b4e3781f16e12db 100644 --- a/smash/web/tests/forms/test_study_forms.py +++ b/smash/web/tests/forms/test_study_forms.py @@ -17,15 +17,14 @@ class StudyFormTests(TestCase): 'nd_number_study_subject_regex').get_default() form.cleaned_data = { 'nd_number_study_subject_regex': nd_number_study_subject_regex_default} - self.assertTrue(form.clean_nd_number_study_subject_regex() - == nd_number_study_subject_regex_default) + + self.assertTrue(form.clean()['nd_number_study_subject_regex'] == nd_number_study_subject_regex_default) # test wrong regex form = StudyEditForm() nd_number_study_subject_regex_default = r'^nd\d{5}$' form.cleaned_data = { 'nd_number_study_subject_regex': nd_number_study_subject_regex_default} - self.assertRaises( - ValidationError, form.clean_nd_number_study_subject_regex) + self.assertFalse(form.is_valid()) def test_study_other_regex(self): StudySubject.objects.all().delete() @@ -36,5 +35,5 @@ class StudyFormTests(TestCase): nd_number_study_subject_regex_default = r'^nd\d{5}$' form.cleaned_data = { 'nd_number_study_subject_regex': nd_number_study_subject_regex_default} - self.assertTrue(form.clean_nd_number_study_subject_regex() + self.assertTrue(form.clean()['nd_number_study_subject_regex'] == nd_number_study_subject_regex_default)