From f80411a927523f790b6b88ba9e480ef68baab6ed Mon Sep 17 00:00:00 2001 From: Piotr Gawron <piotr.gawron@uni.lu> Date: Fri, 10 Feb 2017 11:42:00 +0100 Subject: [PATCH] refacotr of form data --- smash/web/tests/test_SubjectAddForm.py | 35 +++++++++++--------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/smash/web/tests/test_SubjectAddForm.py b/smash/web/tests/test_SubjectAddForm.py index 6e8e8169..41fdb320 100644 --- a/smash/web/tests/test_SubjectAddForm.py +++ b/smash/web/tests/test_SubjectAddForm.py @@ -3,25 +3,22 @@ from web.forms import SubjectAddForm from web.models import Subject class SubjectAddFormTests(TestCase): - def test_validation(self): - form_data = {'first_name': 'name', - 'last_name': 'name', - 'status' : Subject.STATUS_CHOICES_NOT_CONTACTED, - 'sex' : Subject.SEX_CHOICES_MALE, - 'country' : 'Luxembourg' + def setUp(self): + self.sample_data = {'first_name': 'name', + 'last_name': 'name', + 'status' : Subject.STATUS_CHOICES_NOT_CONTACTED, + 'sex' : Subject.SEX_CHOICES_MALE, + 'country' : 'Luxembourg' } - form = SubjectAddForm(data=form_data) + def test_validation(self): + form = SubjectAddForm(data=self.sample_data) form.is_valid() self.assertTrue(form.is_valid()) def test_invalid(self): - form_data = {'first_name': 'name', - 'last_name': 'name', - 'status' : Subject.STATUS_CHOICES_NOT_CONTACTED, - 'sex' : Subject.SEX_CHOICES_MALE, - 'country' : 'Luxembourg', - 'screening_number' : '123' - } + form_data = self.sample_data + form_data['screening_number'] = "123" + form = SubjectAddForm(data=form_data) form.is_valid() self.assertTrue(form.is_valid()) @@ -33,13 +30,9 @@ class SubjectAddFormTests(TestCase): self.assertTrue("screening_number" in form2.errors) def test_invalid_2(self): - form_data = {'first_name': 'name', - 'last_name': 'name', - 'status' : Subject.STATUS_CHOICES_NOT_CONTACTED, - 'sex' : Subject.SEX_CHOICES_MALE, - 'country' : 'Luxembourg', - 'nd_number' : '123' - } + form_data = self.sample_data + form_data['nd_number'] = "123" + form = SubjectAddForm(data=form_data) form.is_valid() self.assertTrue(form.is_valid()) -- GitLab