Avoid code repetition in the tests UCL-RITS#89

week05-testing/test_times.py

@@ -1,36 +1,45 @@
 from times import time_range, compute_overlap_time
 from pytest import raises
+import pytest
 
-def test_given_input():
-    large = time_range("2010-01-12 10:00:00", "2010-01-12 12:00:00")
-    short = time_range("2010-01-12 10:30:00", "2010-01-12 10:45:00", 2, 60)
+@pytest.mark.parametrize("large, short, expected", 
+                        [(time_range("2010-01-12 10:00:00", "2010-01-12 12:00:00"), time_range("2010-01-12 10:30:00", "2010-01-12 10:45:00", 2, 60), [('2010-01-12 10:30:00', '2010-01-12 10:37:00'), ('2010-01-12 10:38:00', '2010-01-12 10:45:00')])
+                        , (time_range("2010-01-12 11:00:00", "2010-01-12 12:00:00"), time_range("2010-01-12 10:30:00", "2010-01-12 10:45:00"), [])
+                        , (time_range("2010-01-12 10:00:00", "2010-01-12 13:00:00", 2, 0), time_range("2010-01-12 11:00:00", "2010-01-12 12:00:00", 2, 0), [('2010-01-12 11:00:00', '2010-01-12 11:30:00'), ('2010-01-12 11:30:00', '2010-01-12 12:00:00')])
+                        ,(time_range("2010-01-12 10:00:00", "2010-01-12 13:00:00", 2, 0), time_range("2010-01-12 13:00:00", "2010-01-12 14:00:00", 2, 0), [])
+                        ,(time_range("2010-01-12 13:00:00", "2010-01-12 12:00:00", 4, 60), time_range("2010-01-12 14:30:00", "2010-01-12 12:00:00", 2, 60), [])
+                        ])
+
+def test_given_input(large, short,expected):
+    # large = time_range("2010-01-12 10:00:00", "2010-01-12 12:00:00")
+    # short = time_range("2010-01-12 10:30:00", "2010-01-12 10:45:00", 2, 60)
     result = compute_overlap_time(large, short)
-    expected = [('2010-01-12 10:30:00', '2010-01-12 10:37:00'), ('2010-01-12 10:38:00', '2010-01-12 10:45:00')]
+    # expected = [('2010-01-12 10:30:00', '2010-01-12 10:37:00'), ('2010-01-12 10:38:00', '2010-01-12 10:45:00')]
     assert result == expected
 
-def test_no_overlap():
-    large = time_range("2010-01-12 11:00:00", "2010-01-12 12:00:00")
-    short = time_range("2010-01-12 10:30:00", "2010-01-12 10:45:00")
+def test_no_overlap(large, short,expected):
+    # large = time_range("2010-01-12 11:00:00", "2010-01-12 12:00:00")
+    # short = time_range("2010-01-12 10:30:00", "2010-01-12 10:45:00")
     result = compute_overlap_time(large, short)
-    expected = []
+    # expected = []
     assert result == expected
 
-def test_contain_intervals():
-    large = time_range("2010-01-12 10:00:00", "2010-01-12 13:00:00", 2, 0)
-    short = time_range("2010-01-12 11:00:00", "2010-01-12 12:00:00", 2, 0)
+def test_contain_intervals(large, short,expected):
+    # large = time_range("2010-01-12 10:00:00", "2010-01-12 13:00:00", 2, 0)
+    # short = time_range("2010-01-12 11:00:00", "2010-01-12 12:00:00", 2, 0)
     result = compute_overlap_time(large, short)
-    expected = [('2010-01-12 11:00:00', '2010-01-12 11:30:00'), ('2010-01-12 11:30:00', '2010-01-12 12:00:00')]
+    # expected = [('2010-01-12 11:00:00', '2010-01-12 11:30:00'), ('2010-01-12 11:30:00', '2010-01-12 12:00:00')]
     assert result == expected
 
-def test_touching_times():
-    large = time_range("2010-01-12 10:00:00", "2010-01-12 13:00:00", 2, 0)
-    short = time_range("2010-01-12 13:00:00", "2010-01-12 14:00:00", 2, 0)
+def test_touching_times(large, short,expected):
+    # large = time_range("2010-01-12 10:00:00", "2010-01-12 13:00:00", 2, 0)
+    # short = time_range("2010-01-12 13:00:00", "2010-01-12 14:00:00", 2, 0)
     result = compute_overlap_time(large, short)
-    expected = []
+    # expected = []
     assert result == expected
 
-def test_backfoward_date():
-    large = time_range("2010-01-12 13:00:00", "2010-01-12 12:00:00", 4, 60)
-    short = time_range("2010-01-12 14:30:00", "2010-01-12 12:00:00", 2, 60)
+def test_backfoward_date(large,short,expected):
+    # large = time_range("2010-01-12 13:00:00", "2010-01-12 12:00:00", 4, 60)
+    # short = time_range("2010-01-12 14:30:00", "2010-01-12 12:00:00", 2, 60)
     with raises(ValueError):
         compute_overlap_time(large, short)

week05-testing/times.py

@@ -1,5 +1,7 @@
 import datetime
 from pytest import raises
+
+
 def time_range(start_time, end_time, number_of_intervals=1, gap_between_intervals_s=0):
     start_time_s = datetime.datetime.strptime(start_time, "%Y-%m-%d %H:%M:%S")
     end_time_s = datetime.datetime.strptime(end_time, "%Y-%m-%d %H:%M:%S")