#154: Fix broken tests

ral-facilities · Jan 21, 2021 · c84eccf · c84eccf
1 parent deb1539
commit c84eccf
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/test/icat/conftest.py b/test/icat/conftest.py
@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import datetime, timezone
 import uuid
 
 from flask import Flask
@@ -42,10 +42,10 @@ def create_investigation_test_data(client, num_entities=1):
             f"Test data for the Python ICAT Backend on DataGateway API {i}"
         )
         investigation.startDate = datetime(
-            year=2020, month=1, day=4, hour=1, minute=1, second=1,
+            year=2020, month=1, day=4, hour=1, minute=1, second=1, tzinfo=timezone.utc,
         )
         investigation.endDate = datetime(
-            year=2020, month=1, day=8, hour=1, minute=1, second=1,
+            year=2020, month=1, day=8, hour=1, minute=1, second=1, tzinfo=timezone.utc,
         )
         # UUID visit ID means uniquesness constraint should always be met
         investigation.visitId = str(uuid.uuid1())
@@ -105,10 +105,10 @@ def isis_specific_endpoint_data(icat_client):
     facility_cycle = icat_client.new("facilityCycle")
     facility_cycle.name = "Test cycle for DataGateway API testing"
     facility_cycle.startDate = datetime(
-        year=2020, month=1, day=1, hour=1, minute=1, second=1,
+        year=2020, month=1, day=1, hour=1, minute=1, second=1, tzinfo=timezone.utc,
     )
     facility_cycle.endDate = datetime(
-        year=2020, month=2, day=1, hour=1, minute=1, second=1,
+        year=2020, month=2, day=1, hour=1, minute=1, second=1, tzinfo=timezone.utc,
     )
     facility_cycle.facility = icat_client.get("Facility", 1)
     facility_cycle.create()

diff --git a/test/icat/endpoints/test_create_icat.py b/test/icat/endpoints/test_create_icat.py
@@ -10,9 +10,9 @@ def test_valid_create_data(
                 "name": f"Test Data for API Testing, Data Creation {i}",
                 "title": "Test data for the Python ICAT Backend on DataGateway API",
                 "summary": "Test data for DataGateway API testing",
-                "releaseDate": "2020-03-03 08:00:08",
-                "startDate": "2020-02-02 09:00:09",
-                "endDate": "2020-02-03 10:00:10",
+                "releaseDate": "2020-03-03 08:00:08+00:00",
+                "startDate": "2020-02-02 09:00:09+00:00",
+                "endDate": "2020-02-03 10:00:10+00:00",
                 "visitId": "Data Creation Visit",
                 "doi": "DataGateway API Test DOI",
                 "facility": 1,
@@ -57,9 +57,9 @@ def test_valid_boundary_create_data(
             "name": "Test Data for API Testing, Data Creation 0",
             "title": "Test data for the Python ICAT Backend on the API",
             "summary": "Test data for DataGateway API testing",
-            "releaseDate": "2020-03-03 08:00:08",
-            "startDate": "2020-02-02 09:00:09",
-            "endDate": "2020-02-03 10:00:10",
+            "releaseDate": "2020-03-03 08:00:08+00:00",
+            "startDate": "2020-02-02 09:00:09+00:00",
+            "endDate": "2020-02-03 10:00:10+00:00",
             "visitId": "Data Creation Visit",
             "doi": "DataGateway API Test DOI",
             "facility": 1,

diff --git a/test/icat/test_session_handling.py b/test/icat/test_session_handling.py
@@ -16,7 +16,7 @@ def test_get_valid_session_details(
         )
 
         session_expiry_datetime = datetime.strptime(
-            session_details.json["EXPIREDATETIME"], "%Y-%m-%d %H:%M:%S.%f",
+            session_details.json["expireDateTime"], "%Y-%m-%d %H:%M:%S",
         )
         current_datetime = datetime.now()
         time_diff = abs(session_expiry_datetime - current_datetime)
@@ -27,13 +27,13 @@ def test_get_valid_session_details(
 
         # Check username is correct
         assert (
-            session_details.json["USERNAME"] == f"{config.get_test_mechanism()}/"
+            session_details.json["username"] == f"{config.get_test_mechanism()}/"
             f"{config.get_test_user_credentials()['username']}"
         )
 
         # Check session ID matches the header from the request
         assert (
-            session_details.json["ID"]
+            session_details.json["id"]
             == valid_icat_credentials_header["Authorization"].split()[1]
         )
 
@@ -62,8 +62,8 @@ def test_refresh_session(self, valid_icat_credentials_header, flask_test_app_ica
         assert refresh_session.status_code == 200
 
         assert (
-            pre_refresh_session_details.json["EXPIREDATETIME"]
-            != post_refresh_session_details.json["EXPIREDATETIME"]
+            pre_refresh_session_details.json["expireDateTime"]
+            != post_refresh_session_details.json["expireDateTime"]
         )
 
     @pytest.mark.usefixtures("single_investigation_test_data")