From 58d6dec996ca2a767433d9f5d9c1f36d34804812 Mon Sep 17 00:00:00 2001 From: michel Date: Thu, 30 Nov 2017 18:59:43 +0100 Subject: [PATCH 1/7] =?UTF-8?q?Je=20n'ai=20pas=20modifi=C3=A9=20le=20with?= =?UTF-8?q?=20pour=20le=20moment=20et=20j'ai=20une=20syntax=20error=20sur?= =?UTF-8?q?=20mon=20full=5Faddress=20que=20je=20ne=20trouve=20pas.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- coworking_coworker/tests/test_coworking_coworker.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/coworking_coworker/tests/test_coworking_coworker.py b/coworking_coworker/tests/test_coworking_coworker.py index 4d58bf9..e91bc01 100644 --- a/coworking_coworker/tests/test_coworking_coworker.py +++ b/coworking_coworker/tests/test_coworking_coworker.py @@ -33,11 +33,10 @@ class TestCoworkingCoworker(TransactionCase): def test_full_address(self): """ Test full address rendering """ full_contact_adress = fields.Char.from_string(self.homer.full_contact_adress) - self.assertEqual(full_contact_adress, {full_contact_adress = u'{} {} {}'.format (street or u'', contact_zip or u'', city or u'').strip()}) - fulladdr = self.env{'street': '29 Grande rue', 'contact_zip': '26270', 'city': 'Loriol'} + full_address = self.env{'contact_zip': '26270', 'city': 'Loriol'} - self.assertEqual(fulladdr.full_contact_adress, '29 Grande rue 26270 Loriol') + self.assertEqual(full_address.full_contact_adress, '26270 Loriol') with self.assertRaises(ValidationError) as err: fulladdr = {'street': '29 Grande rue', From 6685e4e369a555173b1e0101e50ff09e7e5cb890 Mon Sep 17 00:00:00 2001 From: michel Date: Thu, 30 Nov 2017 19:45:58 +0100 Subject: [PATCH 2/7] Ajout du test d'erreurs --- .../tests/test_coworking_coworker.py | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/coworking_coworker/tests/test_coworking_coworker.py b/coworking_coworker/tests/test_coworking_coworker.py index e91bc01..c838e22 100644 --- a/coworking_coworker/tests/test_coworking_coworker.py +++ b/coworking_coworker/tests/test_coworking_coworker.py @@ -31,19 +31,27 @@ class TestCoworkingCoworker(TransactionCase): self.assertIn('equal of inferior to', unicode(err.exception)) def test_full_address(self): - """ Test full address rendering """ - full_contact_adress = fields.Char.from_string(self.homer.full_contact_adress) + self.homer.write({'street': False, 'zip': False, 'city': False}) + self.assertEqual(self.homer.full_contact_adress, u'') - full_address = self.env{'contact_zip': '26270', 'city': 'Loriol'} + self.homer.write({'street': False, 'zip': False, 'city': u'Springfield'}) + self.assertEqual(self.homer.full_contact_adress, u'Springfield') - self.assertEqual(full_address.full_contact_adress, '26270 Loriol') + self.homer.write({'street': False, 'zip': u'5555', 'city': u'Springfield'}) + self.assertEqual(self.homer.full_contact_adress, u'5555 Springfield') + + self.homer.write({'street': u'42 Liberty Street', 'zip': u'5555', 'city': u'Springfield'}) + self.assertEqual(self.homer.full_contact_adress, u'42 Liberty Street 5555 Springfield') + + self.homer.write({'street': u'42 Liberty Street', 'zip': False, 'city': u'Springfield'}) + self.assertEqual(self.homer.full_contact_adress, u'42 Liberty Street Springfield') with self.assertRaises(ValidationError) as err: - fulladdr = {'street': '29 Grande rue', - 'contact_zip': '26270', - 'city': 'Loriol'} - self.env['coworking.coworker'].create(full_contact_adress) - self.assertIn('No full address valide', unicode(err.exception)) + + self.homer.write({'street': False, 'zip': False, 'city': False}) + self.assertEqual(self.homer.full_contact_adress, u'Springfield') + + self.assertIn('Full adresse is broken', unicode(err.exception)) From c6c518ff6830e455e4f5dc38e6c32b827b8ed34c Mon Sep 17 00:00:00 2001 From: michel Date: Thu, 30 Nov 2017 19:46:20 +0100 Subject: [PATCH 3/7] / --- coworking_coworker/tests/test_coworking_coworker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coworking_coworker/tests/test_coworking_coworker.py b/coworking_coworker/tests/test_coworking_coworker.py index c838e22..3488993 100644 --- a/coworking_coworker/tests/test_coworking_coworker.py +++ b/coworking_coworker/tests/test_coworking_coworker.py @@ -51,7 +51,7 @@ class TestCoworkingCoworker(TransactionCase): self.homer.write({'street': False, 'zip': False, 'city': False}) self.assertEqual(self.homer.full_contact_adress, u'Springfield') - self.assertIn('Full adresse is broken', unicode(err.exception)) + self.assertIn('Full adresse is broken', unicode(err.exception)) From 8ffd02364062f5628f59eec46be6a67450852b8a Mon Sep 17 00:00:00 2001 From: michel Date: Mon, 4 Dec 2017 10:20:50 +0100 Subject: [PATCH 4/7] Test de full_adress OK --- coworking_coworker/tests/test_coworking_coworker.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/coworking_coworker/tests/test_coworking_coworker.py b/coworking_coworker/tests/test_coworking_coworker.py index 3488993..aeddba9 100644 --- a/coworking_coworker/tests/test_coworking_coworker.py +++ b/coworking_coworker/tests/test_coworking_coworker.py @@ -46,15 +46,7 @@ class TestCoworkingCoworker(TransactionCase): self.homer.write({'street': u'42 Liberty Street', 'zip': False, 'city': u'Springfield'}) self.assertEqual(self.homer.full_contact_adress, u'42 Liberty Street Springfield') - with self.assertRaises(ValidationError) as err: - - self.homer.write({'street': False, 'zip': False, 'city': False}) - self.assertEqual(self.homer.full_contact_adress, u'Springfield') - - self.assertIn('Full adresse is broken', unicode(err.exception)) - - - + def test_manage_coworker_type(self): """ Test that non-coworker have not coworker_type fixed """ pass From 97192b2a3ce002a51c1875edf8d3a957e28412e8 Mon Sep 17 00:00:00 2001 From: michel Date: Mon, 4 Dec 2017 10:23:33 +0100 Subject: [PATCH 5/7] / --- coworking_coworker/tests/test_coworking_coworker.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/coworking_coworker/tests/test_coworking_coworker.py b/coworking_coworker/tests/test_coworking_coworker.py index aeddba9..6166655 100644 --- a/coworking_coworker/tests/test_coworking_coworker.py +++ b/coworking_coworker/tests/test_coworking_coworker.py @@ -31,6 +31,7 @@ class TestCoworkingCoworker(TransactionCase): self.assertIn('equal of inferior to', unicode(err.exception)) def test_full_address(self): + """Test full address""" self.homer.write({'street': False, 'zip': False, 'city': False}) self.assertEqual(self.homer.full_contact_adress, u'') @@ -46,7 +47,9 @@ class TestCoworkingCoworker(TransactionCase): self.homer.write({'street': u'42 Liberty Street', 'zip': False, 'city': u'Springfield'}) self.assertEqual(self.homer.full_contact_adress, u'42 Liberty Street Springfield') - + def test_manage_coworker_type(self): """ Test that non-coworker have not coworker_type fixed """ + + pass From 32f8dd52ea09583937397123e4b233f3a329cd21 Mon Sep 17 00:00:00 2001 From: michel Date: Mon, 4 Dec 2017 11:22:45 +0100 Subject: [PATCH 6/7] Debut du test coworker type --- .../tests/test_coworking_coworker.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/coworking_coworker/tests/test_coworking_coworker.py b/coworking_coworker/tests/test_coworking_coworker.py index 6166655..43d8577 100644 --- a/coworking_coworker/tests/test_coworking_coworker.py +++ b/coworking_coworker/tests/test_coworking_coworker.py @@ -50,6 +50,22 @@ class TestCoworkingCoworker(TransactionCase): def test_manage_coworker_type(self): """ Test that non-coworker have not coworker_type fixed """ + homer = self.env['res.partner'].create({'name': 'Homer Simpson', 'is_coworker': False}) + self.assertEqual(homer.coworker_type, False) + # self.homer.write({'is_coworker': False}) + # self.assertEqual(self.homer.coworker_type, 'False') + # + # self.homer.write({'coworker_type': 'worker'}) + # self.assertEqual(self.homer.coworker_type, u'Worker') + # self.homer.write({'coworker_type': 'member'}) + # self.assertEqual(self.homer.coworker_type, u'Member') + # self.homer.write({'coworker_type': 'volunteer'}) + # self.assertEqual(self.homer.coworker_type, u'Volunteer') + # self.homer.write({'coworker_type': 'visitor'}) + # self.assertEqual(self.homer.coworker_type, u'visitor') - pass + # with self.assertRaises(ValidationError) as err: + # data = {'is_coworker': True, 'coworker_type': False} + # self.env['res.partner'].create(data) + # self.assertIn('Coworker type is required', unicode(err.exception)) From 9e40808da70406804374f78c888a992b0746f340 Mon Sep 17 00:00:00 2001 From: michel Date: Mon, 4 Dec 2017 11:32:09 +0100 Subject: [PATCH 7/7] Defini homer comme non coworker et dit que le resultat de coworker-type est false --- coworking_coworker/tests/test_coworking_coworker.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/coworking_coworker/tests/test_coworking_coworker.py b/coworking_coworker/tests/test_coworking_coworker.py index 43d8577..2012952 100644 --- a/coworking_coworker/tests/test_coworking_coworker.py +++ b/coworking_coworker/tests/test_coworking_coworker.py @@ -52,19 +52,7 @@ class TestCoworkingCoworker(TransactionCase): """ Test that non-coworker have not coworker_type fixed """ homer = self.env['res.partner'].create({'name': 'Homer Simpson', 'is_coworker': False}) self.assertEqual(homer.coworker_type, False) - - # self.homer.write({'is_coworker': False}) - # self.assertEqual(self.homer.coworker_type, 'False') # - # self.homer.write({'coworker_type': 'worker'}) - # self.assertEqual(self.homer.coworker_type, u'Worker') - # self.homer.write({'coworker_type': 'member'}) - # self.assertEqual(self.homer.coworker_type, u'Member') - # self.homer.write({'coworker_type': 'volunteer'}) - # self.assertEqual(self.homer.coworker_type, u'Volunteer') - # self.homer.write({'coworker_type': 'visitor'}) - # self.assertEqual(self.homer.coworker_type, u'visitor') - # with self.assertRaises(ValidationError) as err: # data = {'is_coworker': True, 'coworker_type': False} # self.env['res.partner'].create(data)