From 3f3bdcdb0dad01586e9f0cbf4a087ba75a49f63c Mon Sep 17 00:00:00 2001 From: eloyoussef Date: Fri, 2 Mar 2018 23:41:19 +0100 Subject: [PATCH] =?UTF-8?q?Ajout=20du=20test=20d'interdiction=20sur=20atte?= =?UTF-8?q?nte=20si=20d=C3=A9ja=20inscrit=20sur=20activity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tests/test_golem_activity.py | 12 ++-- .../tests/test_golem_activity_queue.py | 63 ++++++++++++------- .../tests/test_golem_member.py | 5 +- 3 files changed, 52 insertions(+), 28 deletions(-) diff --git a/golem_activity_queue/tests/test_golem_activity.py b/golem_activity_queue/tests/test_golem_activity.py index cd28876..9572d0c 100644 --- a/golem_activity_queue/tests/test_golem_activity.py +++ b/golem_activity_queue/tests/test_golem_activity.py @@ -21,6 +21,7 @@ from odoo.models import ValidationError class TestGolemActivity(TransactionCase): + """ GOLEM Activity Queue testing """ def setUp(self): """ Bootstrap activity """ @@ -56,7 +57,7 @@ class TestGolemActivity(TransactionCase): self.assertEqual(activity.queue_activity_number, 0) self.assertFalse(activity.activity_registration_ids) self.assertFalse(activity.activity_queue_ids) - print "_____ activity creation " + #test toggle auto_registration def test_auto_registration_toggle(self): @@ -97,14 +98,15 @@ class TestGolemActivity(TransactionCase): self.assertFalse(activity.queue_allowed) self.assertFalse(activity.activity_queue_ids) #appel wizard pour activation de l'attente - queue_activate_wizard = self.env['golem.activity.automated.queue.activate.wizard'].create({'activity_id': activity.id}) + queue_activate_wizard_model = self.env['golem.activity.automated.queue.activate.wizard'] + queue_activate_wizard = queue_activate_wizard_model.create({'activity_id': activity.id}) queue_activate_wizard.activate_queue() #verification de l'attente activité self.assertTrue(activity.queue_allowed) self.assertTrue(activity.auto_registration_from_queue) #test de basculement automatique depuis queue - def test_auto_registration_from_queue(self): + def test_auto_registration(self): """ Test auto registration from queue """ #création de 2 membre est une activité member1 = self.member1.create(self.data_member_1) @@ -131,7 +133,9 @@ class TestGolemActivity(TransactionCase): self.assertEqual(activity.activity_registration_ids[0].member_id, member1) self.assertEqual(activity.activity_queue_ids[0].member_id, member2) #suppression du membre 1 de l'activity - activity.write({'activity_registration_ids': [(2, activity.activity_registration_ids[0].id, False)]}) + activity.write({'activity_registration_ids': [(2, + activity.activity_registration_ids[0].id, + False)]}) #verifcation de la presence du membre 2 sur activity : basculement depuis attente self.assertEqual(activity.activity_registration_ids[0].member_id, member2) #verification de l'attente est vide diff --git a/golem_activity_queue/tests/test_golem_activity_queue.py b/golem_activity_queue/tests/test_golem_activity_queue.py index 6d0e509..a32734e 100644 --- a/golem_activity_queue/tests/test_golem_activity_queue.py +++ b/golem_activity_queue/tests/test_golem_activity_queue.py @@ -30,29 +30,48 @@ class TestGolemActivityQueue(TransactionCase): super(TestGolemActivityQueue, self).setUp(*args, **kwargs) self.season = self.env['golem.season'].sudo().create({'name': u'Season 1'}) + self.season.do_default_season() + #préparation des données pour la création des membres + self.data_member_1 = {'lastname': u'LAST1', + 'firstname': u'First1', + 'season_ids':[(4, self.season.id, False)] + } + self.data_member_2 = {'lastname': u'LAST2', + 'firstname': u'First2', + 'season_ids':[(4, self.season.id, False)] + } + self.member1 = self.env['golem.member'] + self.member2 = self.env['golem.member'] + #préparation des donnée pour la création de l'activité type_id = self.ref("golem_activity.golem_activity_type_activity") - print "_______________________" - print self.season - print type_id - self.activity = self.env['golem.activity'].create({'name': u'Activity 1', - 'season_id': self.season.id, - 'type_id': type_id}) - self.member = self.env['golem.member'].create({ - 'lastname': u'LAST', - 'firstname': u'First' - }) - self.data = { - 'activity_id': self.activity.id, - 'member_id': self.member.id, - 'avaibility_start': '2018-01-01', - 'avaibility_stop': '2020-01-01' - } - self.activity_queue_obj = self.env['golem.activity.queue'] + self.data_activity = { + 'name': u'Activity 1', + 'season_id': self.season.id, + 'type_id': type_id} + self.activity = self.env['golem.activity'] + self.activity_queue = self.env['golem.activity.queue'] def test_activity_queue_basic(self): """ Test activity queue bases """ - activity_queue = self.activity_queue_obj.create(self.data) - self.assertEqual(activity_queue.member_id, self.member) - self.assertEqual(activity_queue.activity_id, self.activity) - self.assertEqual(activity_queue.activity_id.activity_queue_ids[0], activity_queue) - self.assertEqual(activity_queue.places_remain, self.activity.places_remain) + member1 = self.member1.create(self.data_member_1) + activity = self.activity.create(self.data_activity) + activity_queue = self.activity_queue.create({'activity_id': activity.id, + 'member_id': member1.id}) + self.assertEqual(activity.activity_queue_ids[0], activity_queue) + self.assertEqual(member1.activity_queue_ids[0], activity_queue) + + #test interdiction d'inscrire sur attente si inscrit sur activité + def test_check_member_registration(self): + """ Test activity queue bases """ + #creation du membre et de l'activité + member1 = self.member1.create(self.data_member_1) + activity = self.activity.create(self.data_activity) + #enregistrement du membre 1 sur activity + activity.write({'activity_registration_ids': [(0, False, {'activity_id': activity.id, + 'member_id': member1.id})]}) + #vérification que le membre 1 est inscrit sur activité + self.assertEqual(activity.activity_registration_ids[0].member_id, member1) + #inscription du meme membre sur l'attente du meme activié: interdit + with self.assertRaises(ValidationError): + activity_queue = self.activity_queue.create({'activity_id': activity.id, + 'member_id': member1.id}) diff --git a/golem_activity_queue/tests/test_golem_member.py b/golem_activity_queue/tests/test_golem_member.py index dfa49bf..90e9b91 100644 --- a/golem_activity_queue/tests/test_golem_member.py +++ b/golem_activity_queue/tests/test_golem_member.py @@ -87,9 +87,10 @@ class TestGolemMember(TransactionCase): self.assertEqual(activity.activity_registration_ids[0].member_id, member1) self.assertEqual(activity.activity_queue_ids[0].member_id, member2) #suppression du membre 1 de l'activity - member1.write({'activity_registration_ids': [(2, member1.activity_registration_ids[0].id, False)]}) + member1.write({'activity_registration_ids': [(2, + member1.activity_registration_ids[0].id, + False)]}) #verifcation de la presence du membre 2 sur activity : basculement depuis attente self.assertEqual(activity.activity_registration_ids[0].member_id, member2) #verification de l'attente est vide self.assertFalse(activity.activity_queue_ids) - print "test membre fini __________________________tn "