Added more tests and checks

Author: mrm9084

featuremanagement/_time_window_filter/_models.py

@@ -82,7 +82,11 @@ def __init__(self, pattern_data: Dict[str, Any]):
         # Days of the week are represented as a list of integers from 0 to 6.
         self.days_of_week = []
         for day in days_of_week_str:
+            if day not in self.days:
+                raise ValueError(f"Invalid value for DaysOfWeek: {day}")
             self.days_of_week.append(self.days.index(day))
+        if pattern_data.get("FirstDayOfWeek") and pattern_data.get("FirstDayOfWeek") not in self.days:
+            raise ValueError(f"Invalid value for FirstDayOfWeek: {pattern_data.get('FirstDayOfWeek')}")
         self.first_day_of_week = self.days.index(pattern_data.get("FirstDayOfWeek", "Sunday"))
 
 
@@ -98,7 +102,10 @@ def __init__(self, range_data: Dict[str, Any]):
         self.type = RecurrenceRangeType.from_str(range_data.get("Type", "NoEnd"))
         if range_data.get("EndDate") and isinstance(range_data.get("EndDate"), str):
             end_date_str = range_data.get("EndDate", "")
-            self.end_date = parsedate_to_datetime(end_date_str) if end_date_str else None
+            try:
+                self.end_date = parsedate_to_datetime(end_date_str) if end_date_str else None
+            except ValueError:
+                raise ValueError(f"Invalid value for EndDate: {end_date_str}")
         self.num_of_occurrences = range_data.get("NumberOfOccurrences", math.pow(2, 63) - 1)
         if self.num_of_occurrences < 0:
             raise ValueError("The number of occurrences must be greater than or equal to 0.")

tests/time_window_filter/test_recurrence_validator.py

@@ -191,4 +191,24 @@ def test_is_duration_compliant_with_days_of_week_false():
 def test_sort_days_of_week():
     days_of_week = [0, 3, 5] # Monday, Thursday, Saturday
     sorted_days = _sort_days_of_week(days_of_week, 6)
-    assert sorted_days == [0, 3, 5]
+    assert sorted_days == [0, 3, 5]
+
+    days_of_week = [5, 0, 3] # Saturday, Monday, Thursday
+    sorted_days = _sort_days_of_week(days_of_week, 6)
+    assert sorted_days == [0, 3, 5]
+
+    days_of_week = [0, 1, 2, 3, 4, 5, 6] # All days of the week
+    sorted_days = _sort_days_of_week(days_of_week, 6)
+    assert sorted_days == [6, 0, 1, 2, 3, 4, 5]
+
+    days_of_week = [6, 5, 4, 3, 2, 1, 0] # All days of the week in reverse order
+    sorted_days = _sort_days_of_week(days_of_week, 6)
+    assert sorted_days == [6, 0, 1, 2, 3, 4, 5]
+
+    days_of_week = [0, 2, 4, 6] # Monday, Wednesday, Friday, Sunday
+    sorted_days = _sort_days_of_week(days_of_week, 2)
+    assert sorted_days == [2, 4, 6, 0]
+
+    days_of_week = [1] # Tuesday
+    sorted_days = _sort_days_of_week(days_of_week, 0)
+    assert sorted_days == [1]

tests/time_window_filter/test_time_window_filter_models.py

@@ -0,0 +1,87 @@
+# ------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+# -------------------------------------------------------------------------
+from featuremanagement._time_window_filter._models import RecurrencePatternType, RecurrenceRangeType, RecurrencePattern, RecurrenceRange, Recurrence
+from datetime import datetime
+import math
+
+def test_recurrence_pattern_type():
+    assert RecurrencePatternType.from_str("Daily") == RecurrencePatternType.DAILY
+    assert RecurrencePatternType.from_str("Weekly") == RecurrencePatternType.WEEKLY
+    try:
+        RecurrencePatternType.from_str("Invalid")
+    except ValueError as e:
+        assert str(e) == "Invalid value: Invalid"
+
+def test_recurrence_range_type():
+    assert RecurrenceRangeType.from_str("NoEnd") == RecurrenceRangeType.NO_END
+    assert RecurrenceRangeType.from_str("EndDate") == RecurrenceRangeType.END_DATE
+    assert RecurrenceRangeType.from_str("Numbered") == RecurrenceRangeType.NUMBERED
+    try:
+        RecurrenceRangeType.from_str("Invalid")
+    except ValueError as e:
+        assert str(e) == "Invalid value: Invalid"
+
+def test_recurrence_pattern():
+    pattern = RecurrencePattern({"Type":"Daily", "Interval":1, "DaysOfWeek":["Monday", "Tuesday"]})
+    assert pattern.type == RecurrencePatternType.DAILY
+    assert pattern.interval == 1
+    assert pattern.days_of_week == [0, 1]
+    assert pattern.first_day_of_week == 6
+
+    pattern = RecurrencePattern({"Type":"Daily", "Interval":1, "DaysOfWeek":["Monday", "Tuesday"], "FirstDayOfWeek":"Monday"})
+    assert pattern.type == RecurrencePatternType.DAILY
+    assert pattern.interval == 1
+    assert pattern.days_of_week == [0, 1]
+    assert pattern.first_day_of_week == 0
+
+    try:
+        pattern = RecurrencePattern({"Type":"Daily", "Interval":1, "DaysOfWeek":["Monday", "Tuesday"], "FirstDayOfWeek":"Thor's day"})
+    except ValueError as e:
+        assert str(e) == "Invalid value for FirstDayOfWeek: Thor's day"
+
+    pattern = RecurrencePattern({"Type":"Weekly", "Interval":2, "DaysOfWeek":["Wednesday"]})
+    assert pattern.type == RecurrencePatternType.WEEKLY
+    assert pattern.interval == 2
+    assert pattern.days_of_week == [2]
+    assert pattern.first_day_of_week == 6
+
+    try:
+        pattern = RecurrencePattern({"Type":"Daily", "Interval":0, "DaysOfWeek":["Monday", "Tuesday"]})
+    except ValueError as e:
+        assert str(e) == "The interval must be greater than 0."
+
+    try:
+        pattern = RecurrencePattern({"Type":"Daily", "Interval":1, "DaysOfWeek":["Monday", "Thor's day"]})
+    except ValueError as e:
+        assert str(e) == "Invalid value for DaysOfWeek: Thor's day"
+
+def test_recurrence_range():
+    max_occurrences = math.pow(2, 63) - 1
+
+    range = RecurrenceRange({"Type":"NoEnd"})
+    assert range.type == RecurrenceRangeType.NO_END
+    assert range.end_date is None
+    assert range.num_of_occurrences == max_occurrences
+
+    range = RecurrenceRange({"Type":"EndDate", "EndDate":"Mon, 31 Mar 2025 00:00:00"})
+    assert range.type == RecurrenceRangeType.END_DATE
+    assert range.end_date == datetime(2025, 3, 31, 0, 0, 0)
+    assert range.num_of_occurrences == max_occurrences
+
+    range = RecurrenceRange({"Type":"Numbered", "NumberOfOccurrences":10})
+    assert range.type == RecurrenceRangeType.NUMBERED
+    assert range.end_date is None
+    assert range.num_of_occurrences == 10
+
+    try:
+        range = RecurrenceRange({"Type":"NoEnd", "NumberOfOccurrences":-1})
+    except ValueError as e:
+        assert str(e) == "The number of occurrences must be greater than or equal to 0."
+
+    try:
+        range = RecurrenceRange({"Type":"EndDate", "EndDate":"InvalidDate"})
+    except ValueError as e:
+        assert str(e) == "Invalid value for EndDate: InvalidDate"