diff --git a/tests/domain/test_therapy_event.py b/tests/domain/test_therapy_event.py index 5f32274..46ae8fd 100644 --- a/tests/domain/test_therapy_event.py +++ b/tests/domain/test_therapy_event.py @@ -3,6 +3,7 @@ from tconnectsync.domain.bolus import Bolus from tconnectsync.domain.therapy_event import BolusTherapyEvent, CGMTherapyEvent +from ..util.utilities import replace_with_user_tz class TestCGMTherapyEvent(unittest.TestCase): maxDiff = None @@ -103,8 +104,8 @@ def test_standard_to_bolus(self): description="Standard", complete="1", completion="Completed", - request_time="2022-07-21 12:27:36-04:00", - completion_time="2022-07-21 12:29:21-04:00", + request_time=replace_with_user_tz("2022-07-21 12:27:36-04:00"), + completion_time=replace_with_user_tz("2022-07-21 12:29:21-04:00"), insulin="4.17", requested_insulin="4.17", carbs="25", @@ -176,8 +177,8 @@ def test_correction_to_bolus(self): description="Automatic Bolus/Correction", complete="1", completion="Completed", - request_time="2022-07-21 11:53:08-04:00", - completion_time="2022-07-21 11:55:24-04:00", + request_time=replace_with_user_tz("2022-07-21 11:53:08-04:00"), + completion_time=replace_with_user_tz("2022-07-21 11:55:24-04:00"), insulin="2.9", requested_insulin="2.9", carbs="0", @@ -259,8 +260,8 @@ def test_extended_bolus_incomplete_to_bolus(self): description="Extended 50.00%/0.00", complete="0", completion="", - request_time="2022-08-09 23:19:15-04:00", - completion_time="2022-08-09 23:20:04-04:00", + request_time=replace_with_user_tz("2022-08-09 23:19:15-04:00"), + completion_time=replace_with_user_tz("2022-08-09 23:20:04-04:00"), insulin="0.2", requested_insulin="0.2", carbs="0", @@ -268,7 +269,7 @@ def test_extended_bolus_incomplete_to_bolus(self): user_override="1", extended_bolus="1", bolex_completion_time="", - bolex_start_time="2022-08-09 23:20:04-04:00" + bolex_start_time=replace_with_user_tz("2022-08-09 23:20:04-04:00") ))) extendedBolusJson = { @@ -347,16 +348,16 @@ def test_extended_bolus_complete_to_bolus(self): description="Extended 50.00%/0.00", complete="1", completion="Completed", - request_time="2022-08-09 23:19:15-04:00", - completion_time="2022-08-09 23:20:04-04:00", + request_time=replace_with_user_tz("2022-08-09 23:19:15-04:00"), + completion_time=replace_with_user_tz("2022-08-09 23:20:04-04:00"), insulin="0.2", requested_insulin="0.2", carbs="0", bg="131", user_override="1", extended_bolus="1", - bolex_completion_time="2022-08-09 23:35:03-04:00", - bolex_start_time="2022-08-09 23:20:04-04:00" + bolex_completion_time=replace_with_user_tz("2022-08-09 23:35:03-04:00"), + bolex_start_time=replace_with_user_tz("2022-08-09 23:20:04-04:00") ))) @@ -364,4 +365,4 @@ def test_extended_bolus_complete_to_bolus(self): TestBolusTherapyEvent.standardJson, TestBolusTherapyEvent.correctionJson, TestBolusTherapyEvent.extendedBolusJson -] \ No newline at end of file +] diff --git a/tests/util/__init__.py b/tests/util/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/util/utilities.py b/tests/util/utilities.py new file mode 100644 index 0000000..9e8938a --- /dev/null +++ b/tests/util/utilities.py @@ -0,0 +1,10 @@ +import arrow +from tconnectsync.secret import TIMEZONE_NAME + +""" +Replaces timezone in string with provided timezone string, defaults to 'America/New_York' + Example 1: replace_datetime_tz("2021-04-01 23:15:30-04:00") + Example 2: replace_datetime_tz("2021-04-01 23:15:30-04:00", 'America/Chicago') +""" +def replace_with_user_tz(date, tz=TIMEZONE_NAME): + return arrow.get(date, tzinfo=tz).format()