Repository :
http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
---------------------------------------------------------------
commit 0fab36cd7e7d2e0543672100bc44dec98e3992d1
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Sun Nov 4 15:37:54 2012 +0100
Make use of the global TODAY for the tests
---------------------------------------------------------------
fedocal/tests/test_week.py | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/fedocal/tests/test_week.py b/fedocal/tests/test_week.py
index d32dc43..f3ce9f2 100644
--- a/fedocal/tests/test_week.py
+++ b/fedocal/tests/test_week.py
@@ -47,7 +47,7 @@ from fedocallib import model
from fedocallib import week
from tests import Modeltests
-from test_meeting import Meetingtests
+from test_meeting import Meetingtests, TODAY
class Weektests(Modeltests):
@@ -69,32 +69,29 @@ class Weektests(Modeltests):
def test_init_week(self):
""" Test the Week init function. """
calendar = model.Calendar.by_id(self.session, 'test_calendar')
- today = date.today()
- end_date = today + timedelta(days=7)
- weekobj = week.Week(self.session, calendar, today)
+ end_date = TODAY + timedelta(days=7)
+ weekobj = week.Week(self.session, calendar, TODAY)
self.assertNotEqual(weekobj, None)
- self.assertEqual(weekobj.start_date, today)
+ self.assertEqual(weekobj.start_date, TODAY)
self.assertEqual(weekobj.stop_date, end_date)
- self.assertEqual(len(weekobj.meetings), 2)
+ self.assertEqual(len(weekobj.meetings), 4)
def test_repr_week(self):
""" Test if the week string representation is correct.
"""
calendar = model.Calendar.by_id(self.session, 'test_calendar')
- today = date.today()
- end_date = today + timedelta(days=7)
- weekobj = week.Week(self.session, calendar, today)
+ end_date = TODAY + timedelta(days=7)
+ weekobj = week.Week(self.session, calendar, TODAY)
self.assertNotEqual(weekobj, None)
self.assertEqual(str(weekobj), "<Week('%s' from '%s' to
'%s')>" % (
- calendar.calendar_name, today, end_date))
+ calendar.calendar_name, TODAY, end_date))
def test_meeting_in_week(self):
""" Test that the meetings in the week are correct function.
"""
calendar = model.Calendar.by_id(self.session, 'test_calendar')
- today = date.today()
- end_date = today + timedelta(days=7)
- weekobj = week.Week(self.session, calendar, today)
+ end_date = TODAY + timedelta(days=7)
+ weekobj = week.Week(self.session, calendar, TODAY)
# Test the meeting in the week
self.assertNotEqual(weekobj, None)