Move the unit tests to a new file

Author: caroline-ttd

pyproject.toml

@@ -22,8 +22,7 @@ requires-python = ">=3.6"
 dependencies = [
     "setuptools",
     "pycryptodome",
-    "bitarray",
-    "pytz"
+    "bitarray"
 ]
 keywords = ["uid2"]
 [project.license]

tests/test_identity_map_client.py

@@ -4,8 +4,7 @@
 
 from urllib.error import URLError, HTTPError
 
-from uid2_client import IdentityMapClient, IdentityMapInput, normalize_and_hash_email, normalize_and_hash_phone, \
-    get_datetime_utc_iso_format
+from uid2_client import IdentityMapClient, IdentityMapInput, normalize_and_hash_email, normalize_and_hash_phone
 
 
 class IdentityMapIntegrationTests(unittest.TestCase):
@@ -183,29 +182,5 @@ def test_identity_buckets_empty_response(self):
         self.assertTrue(len(response.buckets) == 0)
         self.assertTrue(response.is_success)
 
-    def test_identity_buckets_invalid_timestamp(self):
-        test_cases = ["1234567890",
-                      1234567890,
-                      2024.7,
-                      "2024-7-1",
-                      "2024-07-01T12:00:00",
-                      [2024, 7, 1, 12, 0, 0],
-                      None]
-        for timestamp in test_cases:
-            self.assertRaises(AttributeError, self.identity_map_client.get_identity_buckets,
-                              timestamp)
-
-    def test_get_datetime_utc_iso_format_timestamp(self):
-        expected_timestamp = "2024-07-02T14:30:15.123456"
-        test_cases = ["2024-07-02T14:30:15.123456+00:00", "2024-07-02 09:30:15.123456-05:00",
-                      "2024-07-02T08:30:15.123456-06:00", "2024-07-02T10:30:15.123456-04:00",
-                      "2024-07-02T06:30:15.123456-08:00", "2024-07-02T23:30:15.123456+09:00",
-                      "2024-07-03T00:30:15.123456+10:00", "2024-07-02T20:00:15.123456+05:30"]
-        for timestamp_str in test_cases:
-            timestamp = dt.datetime.fromisoformat(timestamp_str)
-            iso_format_timestamp = get_datetime_utc_iso_format(timestamp)
-            self.assertEqual(expected_timestamp, iso_format_timestamp)
-
-
 if __name__ == '__main__':
     unittest.main()

tests/test_identity_map_client_unit_tests.py

@@ -0,0 +1,44 @@
+import unittest
+import datetime as dt
+
+from uid2_client import IdentityMapClient, get_datetime_utc_iso_format
+
+
+class IdentityMapUnitTests(unittest.TestCase):
+    UID2_BASE_URL = None
+    UID2_API_KEY = None
+    UID2_SECRET_KEY = None
+
+    identity_map_client = None
+
+    @classmethod
+    def setUpClass(cls):
+        cls.UID2_BASE_URL = "UID2_BASE_URL"
+        cls.UID2_API_KEY = "UID2_API_KEY"
+        cls.UID2_SECRET_KEY = "wJ0hP19QU4hmpB64Y3fV2dAed8t/mupw3sjN5jNRFzg="
+
+        cls.identity_map_client = IdentityMapClient(cls.UID2_BASE_URL, cls.UID2_API_KEY, cls.UID2_SECRET_KEY)
+
+    def test_identity_buckets_invalid_timestamp(self):
+        test_cases = ["1234567890",
+                      1234567890,
+                      2024.7,
+                      "2024-7-1",
+                      "2024-07-01T12:00:00",
+                      [2024, 7, 1, 12, 0, 0],
+                      None]
+        for timestamp in test_cases:
+            self.assertRaises(AttributeError, self.identity_map_client.get_identity_buckets,
+                              timestamp)
+
+    def test_get_datetime_utc_iso_format_timestamp(self):
+        expected_timestamp = "2024-07-02T14:30:15.123456"
+        test_cases = ["2024-07-02T14:30:15.123456+00:00", "2024-07-02 09:30:15.123456-05:00",
+                      "2024-07-02T08:30:15.123456-06:00", "2024-07-02T10:30:15.123456-04:00",
+                      "2024-07-02T06:30:15.123456-08:00", "2024-07-02T23:30:15.123456+09:00",
+                      "2024-07-03T00:30:15.123456+10:00", "2024-07-02T20:00:15.123456+05:30"]
+        for timestamp_str in test_cases:
+            timestamp = dt.datetime.fromisoformat(timestamp_str)
+            iso_format_timestamp = get_datetime_utc_iso_format(timestamp)
+            self.assertEqual(expected_timestamp, iso_format_timestamp)
+

uid2_client/input_util.py

@@ -1,7 +1,6 @@
 import hashlib
 import base64
-
-import pytz
+from datetime import timezone
 
 
 def is_phone_number_normalized(phone_number):
@@ -124,6 +123,6 @@ def normalize_and_hash_phone(phone):
 
 
 def get_datetime_utc_iso_format(timestamp):
-    dt_utc = timestamp.astimezone(pytz.utc)
+    dt_utc = timestamp.astimezone(timezone.utc)
     dt_utc_without_tz = dt_utc.replace(tzinfo=None)
     return dt_utc_without_tz.isoformat()