From b0c7809c0650700da72286b86bf3638c97f0e2a7 Mon Sep 17 00:00:00 2001
From: Carlos Vega <carlos.vega@uni.lu>
Date: Fri, 12 Oct 2018 11:53:10 +0200
Subject: [PATCH] added tests for utils
---
smash/web/tests/view/test_utils.py | 22 ++++++++++++++++++++++
smash/web/utils.py | 6 +++---
2 files changed, 25 insertions(+), 3 deletions(-)
create mode 100644 smash/web/tests/view/test_utils.py
diff --git a/smash/web/tests/view/test_utils.py b/smash/web/tests/view/test_utils.py
new file mode 100644
index 00000000..ba1df273
--- /dev/null
+++ b/smash/web/tests/view/test_utils.py
@@ -0,0 +1,22 @@
+import logging
+
+from django.test import TestCase
+
+from web.utils import get_weekdays_in_period
+
+from datetime import date
+import datetime
+
+logger = logging.getLogger(__name__)
+
+class Utils(TestCase):
+ def test_get_weekdays_in_period(self):
+ fromdate = date(2018,10,9)
+ todate = date(2018,10,12)
+ weekdays = get_weekdays_in_period(fromdate, todate)
+ self.assertEqual(weekdays, {2, 3, 4})
+
+ todate = datetime.datetime(2018, 10, 12, 00, 00, 00)
+ fromdate = datetime.datetime(2018, 10, 9, 00, 00, 00)
+ weekdays = get_weekdays_in_period(fromdate, todate)
+ self.assertEqual(weekdays, {2, 3, 4})
\ No newline at end of file
diff --git a/smash/web/utils.py b/smash/web/utils.py
index 81a18cfe..6578824e 100644
--- a/smash/web/utils.py
+++ b/smash/web/utils.py
@@ -33,9 +33,9 @@ def get_weekdays_in_period(fromdate, todate):
fromdate = datetime.datetime(2018, 10, 3, 15, 00, 00)
todate = datetime.datetime.today()
- but they must have the same format !
-
-
+ but both dates must have the same format !
+ todate is not included in the range
+
Weekdays are returned as isoweekdays like the form described in week_choices from constants.py (starting at 1)
'''
if todate < fromdate:
--
GitLab