From 41876e19c050be98fb6c0356cc6fa1832d327ee0 Mon Sep 17 00:00:00 2001 From: eloyoussef Date: Mon, 12 Mar 2018 14:55:47 +0100 Subject: [PATCH] Correction de test --- .../models/golem_resource_reservation.py | 4 +- .../tests/test_golem_resource_reservation.py | 65 ++++++------------- 2 files changed, 24 insertions(+), 45 deletions(-) diff --git a/golem_resource/models/golem_resource_reservation.py b/golem_resource/models/golem_resource_reservation.py index 2fff85e..e098dad 100644 --- a/golem_resource/models/golem_resource_reservation.py +++ b/golem_resource/models/golem_resource_reservation.py @@ -82,6 +82,8 @@ class GolemResourceReservation(models.Model): reservation.name = u'{}/{}'.format(reservation.resource_id.name, reservation.date_start) + + #@api.depends('date', 'hour_start') #def _compute_date_start(self): # """ Computes Date start """ @@ -220,7 +222,7 @@ class GolemResourceReservation(models.Model): raise ValidationError(verr) if not is_day_allowed: verr = _('Not allowed, the resource is not available ' - 'in a day you chosed. Please choose another date.') + 'this day. Please choose another date.') raise ValidationError(verr) # Check if the resource is already taken during this period domain = [('resource_id', '=', reservation.resource_id.id), diff --git a/golem_resource/tests/test_golem_resource_reservation.py b/golem_resource/tests/test_golem_resource_reservation.py index dc58e81..a5f18a3 100644 --- a/golem_resource/tests/test_golem_resource_reservation.py +++ b/golem_resource/tests/test_golem_resource_reservation.py @@ -55,9 +55,8 @@ class TestGolemResourceReservation(TransactionCase): self.data = { 'resource_id': self.resource.id, - 'date': '2018-02-05', # is monday - 'hour_start': 11.0, - 'hour_stop': 12.0, + 'date_start': '2018-02-05 11:00:00', # is monday + 'date_stop': '2018-02-05 12:00:00', 'partner_id': self.partner.id } self.res_obj = self.env['golem.resource.reservation'] @@ -67,28 +66,26 @@ class TestGolemResourceReservation(TransactionCase): reservation = self.res_obj.create(self.data) self.assertEqual(reservation.partner_id, self.partner) self.assertEqual(reservation.user_id, self.env.user) - self.assertEqual(reservation.hour_start, 11.0) - self.assertEqual(reservation.hour_stop, 12.0) - self.assertEqual(reservation.state, 'draft') - self.assertFalse(reservation.rejection_reason) - self.assertEqual(reservation.name, 'Resource/2018-02-05') self.assertEqual(reservation.date_start, '2018-02-05 11:00:00') self.assertEqual(reservation.date_stop, '2018-02-05 12:00:00') + self.assertEqual(reservation.state, 'draft') + self.assertFalse(reservation.rejection_reason) + self.assertEqual(reservation.name, 'Resource/2018-02-05 11:00:00') self.assertEqual(reservation.resource_id, self.resource) self.assertEqual(len(reservation.resource_timetable_ids), 1) self.assertEqual(reservation.resource_id.reservation_ids[0], reservation) def test_reservation_hours(self): - """ Test thats stop hour can not be after or equal start hour """ - self.data['hour_stop'] = 7.0 + """ Test thats stop date can not be after or equal start date """ + self.data['date_stop'] = '2018-02-05 10:00:00' with self.assertRaises(ValidationError): self.res_obj.create(self.data) with self.assertRaises(ValidationError): self.res_obj.create({ - 'resource_id': self.resource.id, 'date': '2018-02-05', - 'hour_start': 12.0, 'hour_stop': 12.0, - 'partner_id': self.partner.id - }) + 'resource_id': self.resource.id, + 'date_start': '2018-02-05 11:00:00', + 'date_stop': '2018-02-05 11:00:00', + 'partner_id': self.partner.id}) def test_state_basic(self): """ Tests basic state methods """ @@ -141,55 +138,35 @@ class TestGolemResourceReservation(TransactionCase): self.env.user.groups_id = [(2, group_manager.id, False)] with self.assertRaises(ValidationError) as err: reservation.state_validated() - self.assertIn(u'autorisations nécessaires pour valider', err.exception.args[0]) + self.assertIn(u'autorisations nécessaires pour valider', err.exception.args[0]) def test_confirmed_period(self): """ Test allowed period """ - self.data['date'] = '2012-01-01' # Out of period + self.data['date_start'] = '2012-02-05 11:00:00' # Out of period reservation = self.res_obj.create(self.data) with self.assertRaises(ValidationError) as err: reservation.state_confirm() - self.assertIn(u'pas disponible durant cette période', err.exception.args[0]) + self.assertIn(u'pas disponible durant cette période', err.exception.args[0]) def test_confirmed_allowed_day(self): """ Test allowed day """ - self.data['date'] = '2018-02-06' # Bad day + self.data['date_start'] = '2018-02-04 11:00:00' # Bad day reservation = self.res_obj.create(self.data) with self.assertRaises(ValidationError) as err: reservation.state_confirm() - self.assertIn('pas disponible ce jour', err.exception.args[0]) + self.assertIn('pas disponible ce jour', err.exception.args[0]) def test_confirmed_allowed_hours(self): """ Test allowed hours """ - self.data['hour_stop'] = 14.0 # Out of range stop hour + self.data['date_stop'] = '2018-02-05 14:00:00' # Out of range stop hour reservation = self.res_obj.create(self.data) with self.assertRaises(ValidationError) as err: reservation.state_confirm() - self.assertIn(u'merci de choisir d\'autres horaires', err.exception.args[0]) + self.assertIn(u'merci de choisir d\'autres horaires', err.exception.args[0]) reservation = self.res_obj.create({'resource_id': self.resource.id, - 'date': '2018-02-05', - 'hour_start': 5.0, # Out of range start hour - 'hour_stop': 12.0, + 'date_start': '2018-02-05 05:00:00',# Out of range start hour + 'date_stop': '2018-02-05 12:00:00', 'partner_id': self.partner.id}) with self.assertRaises(ValidationError) as err: - reservation.state_confirm() + reservation.state_confirm() self.assertIn(u'merci de choisir d\'autres horaires', err.exception.args[0]) - - def test_confirmed_other_res(self): - """ Test if there are other reservations in conflict """ - reservation = self.res_obj.create(self.data) - reservation.state_confirm() - reservation2 = self.res_obj.create({ - 'resource_id': self.resource.id, 'date': '2018-02-05', - 'hour_start': 10.0, 'hour_stop': 11.0, # OK, no conflict - 'partner_id': self.partner.id - }) - reservation2.state_confirm() - reservation3 = self.res_obj.create({ - 'resource_id': self.resource.id, 'date': '2018-02-05', - 'hour_start': 10.0, 'hour_stop': 10.5, # Conflict with 2nd res - 'partner_id': self.partner.id - }) - with self.assertRaises(ValidationError) as err: - reservation3.state_confirm() - self.assertIn(u'déjà réservée durant cette période', err.exception.args[0])