chore: improve test coverage, refactor fixtures

Author: Tom McCarthy

tests/functional/idempotency/conftest.py

@@ -58,6 +58,54 @@ def expected_params_update_item(lambda_response, hashed_idempotency_key):
     }
 
 
+@pytest.fixture
+def expected_params_update_item_with_validation(lambda_response, hashed_idempotency_key, hashed_validation_key):
+    return {
+        "ExpressionAttributeNames": {
+            "#expiry": "expiration",
+            "#response_data": "data",
+            "#status": "status",
+            "#validation_key": "validation",
+        },
+        "ExpressionAttributeValues": {
+            ":expiry": stub.ANY,
+            ":response_data": json.dumps(lambda_response),
+            ":status": "COMPLETED",
+            ":validation_key": hashed_validation_key,
+        },
+        "Key": {"id": hashed_idempotency_key},
+        "TableName": "TEST_TABLE",
+        "UpdateExpression": "SET #response_data = :response_data, "
+        "#expiry = :expiry, #status = :status, "
+        "#validation_key = :validation_key",
+    }
+
+
+@pytest.fixture
+def expected_params_put_item(hashed_idempotency_key):
+    return {
+        "ConditionExpression": "attribute_not_exists(id) OR expiration < :now",
+        "ExpressionAttributeValues": {":now": stub.ANY},
+        "Item": {"expiration": stub.ANY, "id": hashed_idempotency_key, "status": "INPROGRESS"},
+        "TableName": "TEST_TABLE",
+    }
+
+
+@pytest.fixture
+def expected_params_put_item_with_validation(hashed_idempotency_key, hashed_validation_key):
+    return {
+        "ConditionExpression": "attribute_not_exists(id) OR expiration < :now",
+        "ExpressionAttributeValues": {":now": stub.ANY},
+        "Item": {
+            "expiration": stub.ANY,
+            "id": hashed_idempotency_key,
+            "status": "INPROGRESS",
+            "validation": hashed_validation_key,
+        },
+        "TableName": "TEST_TABLE",
+    }
+
+
 @pytest.fixture
 def hashed_idempotency_key(lambda_apigw_event):
     return hashlib.md5(json.dumps(lambda_apigw_event["body"]).encode()).hexdigest()
@@ -69,26 +117,23 @@ def hashed_validation_key(lambda_apigw_event):
 
 
 @pytest.fixture
-def persistence_store(config):
-    persistence_store = DynamoDBPersistenceLayer(event_key_jmespath="body", table_name=TABLE_NAME, boto_config=config)
-    return persistence_store
-
-
-@pytest.fixture
-def persistence_store_with_cache(config):
+def persistence_store(config, request):
     persistence_store = DynamoDBPersistenceLayer(
-        event_key_jmespath="body", table_name=TABLE_NAME, boto_config=config, use_local_cache=True
+        event_key_jmespath="body",
+        table_name=TABLE_NAME,
+        boto_config=config,
+        use_local_cache=request.param["use_local_cache"],
     )
     return persistence_store
 
 
 @pytest.fixture
-def persistence_store_with_validation(config):
+def persistence_store_with_validation(config, request):
     persistence_store = DynamoDBPersistenceLayer(
         event_key_jmespath="body",
         table_name=TABLE_NAME,
         boto_config=config,
-        use_local_cache=True,
+        use_local_cache=request.param,
         payload_validation_jmespath="requestContext",
     )
     return persistence_store