valid values test

Author: Akol125

backend/tests/utils/pre_validation_test_utils.py

@@ -328,11 +328,29 @@ def test_date_time_value(
         * Invalid date time string formats
         * Invalid date-times
         """
+        expected_error_message = (
+            f"{field_location} must be a valid datetime in one of the following formats:"
+            "- 'YYYY-MM-DD' — Full date only"
+            "- 'YYYY-MM-DDThh:mm:ss' — Full date and time without milliseconds"
+            "- 'YYYY-MM-DDThh:mm:ss.f' — Full date and time with milliseconds (any level of precision)"
+            "- 'YYYY-MM-DDThh:mm:ss%z' — Full date and time with timezone (e.g. +00:00 or +01:00)"
+            "- 'YYYY-MM-DDThh:mm:ss.f%z' — Full date and time with milliseconds and timezone"
+        )
+
+        if is_occurrence_date_time:
+             expected_error_message += "Only '+00:00' and '+01:00' are accepted as valid timezone offsets.\n"
+             expected_error_message += f"Note that partial dates are not allowed for {field_location} in this service."
+             valid_datetime_formats = ValidValues.for_date_times_strict_timezones
+             invalid_datetime_formats = InvalidValues.for_date_time_string_formats_for_strict_timezone
+        else:
+            # For recorded, skip values that are valid ISO with non-restricted timezone
+            valid_datetime_formats = ValidValues.for_date_times_relaxed_timezones
+            invalid_datetime_formats = InvalidValues.for_date_time_string_formats_for_relaxed_timezone
 
         valid_json_data = deepcopy(test_instance.json_data)
 
         # Test that valid data is accepted
-        test_valid_values_accepted(test_instance, valid_json_data, field_location, ValidValues.for_date_times)
+        test_valid_values_accepted(test_instance, valid_json_data, field_location, valid_datetime_formats)
 
         # Set list of invalid data types to test
         invalid_data_types_for_strings = InvalidDataTypes.for_strings
@@ -349,25 +367,6 @@ def test_date_time_value(
                 expected_error_message=f"{field_location} must be a string",
             )
 
-        expected_error_message = (
-            f"{field_location} must be a valid datetime in one of the following formats:"
-            "- 'YYYY-MM-DD' — Full date only"
-            "- 'YYYY-MM-DDThh:mm:ss' — Full date and time without milliseconds"
-            "- 'YYYY-MM-DDThh:mm:ss.f' — Full date and time with milliseconds (any level of precision)"
-            "- 'YYYY-MM-DDThh:mm:ss%z' — Full date and time with timezone (e.g. +00:00 or +01:00)"
-            "- 'YYYY-MM-DDThh:mm:ss.f%z' — Full date and time with milliseconds and timezone"
-        )
-
-        if is_occurrence_date_time:
-            expected_error_message += "Only '+00:00' and '+01:00' are accepted as valid timezone offsets.\n"
-            expected_error_message += f"Note that partial dates are not allowed for {field_location} in this service."
-
-        if is_occurrence_date_time:
-            invalid_datetime_formats = InvalidValues.for_date_time_string_formats_for_strict_timezone
-        else:
-            # For recorded, skip values that are valid ISO with non-restricted timezone
-            invalid_datetime_formats = InvalidValues.for_date_time_string_formats_for_relaxed_timezone
-
         # Test invalid date time string formats
         for invalid_occurrence_date_time in invalid_datetime_formats:
             test_invalid_values_rejected(

backend/tests/utils/values_for_tests.py

@@ -31,7 +31,7 @@ class ValidValues:
 
     nhs_number = "9990548609"
 
-    for_date_times = [
+    for_date_times_strict_timezones = [
         "2000-01-01",  # Full date only
         "2000-01-01T00:00:00+00:00",  # Time and offset all zeroes
         "2000-01-01T10:34:27",        # Date with Time only
@@ -44,6 +44,12 @@ class ValidValues:
         "1933-12-31T11:11:11.111111+00:00",  # DateTime with milliseconds to 6 decimal places
     ]
 
+    for_date_times_relaxed_timezones = for_date_times_strict_timezones + [
+        "2000-01-01T00:00:00+05:00",  # Time and offset all zeroes
+        "1933-12-31T11:11:11-01:00",  # Negative offset (with hours and minutes not 0)
+        "1933-12-31T11:11:11.1-05:00",  # DateTime with milliseconds to 1 decimal place
+    ]
+
     for_strings_with_any_length_chars = (
         "This is a really long string with more than 100 characters to test whether the validator is working well!! "
     )