Merge 5b435be into 3f4e345

openhealthcare · Jan 11, 2023 · 39360a5 · 39360a5
2 parents 3f4e345 + 5b435be
commit 39360a5
Showing 1 changed file with 22 additions and 7 deletions.
diff --git a/plugins/covid/tests/test_extract.py b/plugins/covid/tests/test_extract.py
@@ -1,4 +1,5 @@
 import datetime
+from django.utils import timezone
 from opal.core.test import OpalTestCase
 from plugins.covid import extract
 
@@ -24,37 +25,51 @@ def test_no_obs(self):
         )
 
     def test_multiple_later_dates(self):
-        self.obs_1.observation_datetime = datetime.datetime(2021, 11, 16)
+        self.obs_1.observation_datetime = timezone.make_aware(
+            datetime.datetime(2021, 11, 16)
+        )
         self.obs_1.save()
-        self.obs_2.observation_datetime = datetime.datetime(2021, 11, 17)
+        self.obs_2.observation_datetime = timezone.make_aware(
+            datetime.datetime(2021, 11, 17)
+        )
         self.obs_2.save()
         found_obs = extract.get_closest_observation(
             self.patient, 'test_name', 'obs_name', self.followup_date
         )
         self.assertEqual(found_obs.id, self.obs_1.id)
 
     def test_multiple_ealier_dates(self):
-        self.obs_1.observation_datetime = datetime.datetime(2021, 11, 13)
+        self.obs_1.observation_datetime = timezone.make_aware(
+            datetime.datetime(2021, 11, 13)
+        )
         self.obs_1.save()
-        self.obs_2.observation_datetime = datetime.datetime(2021, 11, 14)
+        self.obs_2.observation_datetime = timezone.make_aware(
+            datetime.datetime(2021, 11, 14)
+        )
         self.obs_2.save()
         found_obs = extract.get_closest_observation(
             self.patient, 'test_name', 'obs_name', self.followup_date
         )
         self.assertEqual(found_obs.id, self.obs_2.id)
 
     def test_later_date_vs_earlier_date(self):
-        self.obs_1.observation_datetime = datetime.datetime(2021, 11, 13)
+        self.obs_1.observation_datetime = timezone.make_aware(
+            datetime.datetime(2021, 11, 13)
+        )
         self.obs_1.save()
-        self.obs_2.observation_datetime = datetime.datetime(2021, 11, 16)
+        self.obs_2.observation_datetime = timezone.make_aware(
+            datetime.datetime(2021, 11, 16)
+        )
         self.obs_2.save()
         found_obs = extract.get_closest_observation(
             self.patient, 'test_name', 'obs_name', self.followup_date
         )
         self.assertEqual(found_obs.id, self.obs_2.id)
 
     def test_on_the_follow_up_date(self):
-        self.obs_1.observation_datetime = datetime.datetime(2021, 11, 15)
+        self.obs_1.observation_datetime = timezone.make_aware(
+            datetime.datetime(2021, 11, 15)
+        )
         self.obs_1.save()
         found_obs = extract.get_closest_observation(
             self.patient, 'test_name', 'obs_name', self.followup_date