tests: Strengthen password-suite response assertions with URL checks

Assisted-by: Codex

Author: datalogics-cgreen

tests/live/test_live_encrypt_pdf.py

@@ -26,6 +26,8 @@ def assert_pdf_file_response(
     assert output_file.name.startswith(output_prefix)
     assert output_file.name.endswith(".pdf")
     assert output_file.size > 0
+    output_url = str(output_file.url)
+    assert f"/resource/{output_file.id}" in output_url
     assert response.warning is None
     assert str(response.input_id) == str(input_file.id)
 

tests/live/test_live_permissions_password.py

@@ -28,6 +28,8 @@ def assert_pdf_file_response(
     assert output_file.name.startswith(output_prefix)
     assert output_file.name.endswith(".pdf")
     assert output_file.size > 0
+    output_url = str(output_file.url)
+    assert f"/resource/{output_file.id}" in output_url
     assert response.warning is None
     assert str(response.input_id) == str(input_file.id)
 

tests/test_encrypt_pdf.py

@@ -73,6 +73,20 @@ def build_decrypt_payload(
     ).model_dump(mode="json", by_alias=True, exclude_none=True, exclude_unset=True)
 
 
+def assert_pdf_file_response(
+    response: PdfRestFileBasedResponse, *, expected_name: str, input_file: PdfRestFile
+) -> None:
+    assert isinstance(response, PdfRestFileBasedResponse)
+    output_file = response.output_file
+    assert output_file.name == expected_name
+    assert output_file.type == "application/pdf"
+    assert output_file.size > 0
+    output_url = str(output_file.url)
+    assert f"/resource/{output_file.id}" in output_url
+    assert response.warning is None
+    assert str(response.input_id) == str(input_file.id)
+
+
 @pytest.mark.parametrize(
     "permissions_password",
     [
@@ -132,10 +146,11 @@ def handler(request: httpx.Request) -> httpx.Response:
         )
 
     assert seen == {"post": 1, "get": 1}
-    assert isinstance(response, PdfRestFileBasedResponse)
-    assert response.output_file.name == "encrypted.pdf"
-    assert response.output_file.type == "application/pdf"
-    assert str(response.input_id) == str(input_file.id)
+    assert_pdf_file_response(
+        response,
+        expected_name="encrypted.pdf",
+        input_file=input_file,
+    )
 
 
 def test_change_open_password_request_customization(
@@ -199,8 +214,11 @@ def handler(request: httpx.Request) -> httpx.Response:
             timeout=0.77,
         )
 
-    assert isinstance(response, PdfRestFileBasedResponse)
-    assert response.output_file.name == "rotated-open.pdf"
+    assert_pdf_file_response(
+        response,
+        expected_name="rotated-open.pdf",
+        input_file=input_file,
+    )
     timeout_value = captured_timeout["value"]
     assert timeout_value is not None
     if isinstance(timeout_value, dict):
@@ -257,9 +275,11 @@ def handler(request: httpx.Request) -> httpx.Response:
         )
 
     assert seen == {"post": 1, "get": 1}
-    assert isinstance(response, PdfRestFileBasedResponse)
-    assert response.output_file.name == "decrypted.pdf"
-    assert response.output_file.type == "application/pdf"
+    assert_pdf_file_response(
+        response,
+        expected_name="decrypted.pdf",
+        input_file=input_file,
+    )
 
 
 def test_remove_open_password_request_customization(
@@ -320,8 +340,11 @@ def handler(request: httpx.Request) -> httpx.Response:
             timeout=0.59,
         )
 
-    assert isinstance(response, PdfRestFileBasedResponse)
-    assert response.output_file.name == "decrypted-custom.pdf"
+    assert_pdf_file_response(
+        response,
+        expected_name="decrypted-custom.pdf",
+        input_file=input_file,
+    )
     timeout_value = captured_timeout["value"]
     assert timeout_value is not None
     if isinstance(timeout_value, dict):
@@ -389,8 +412,11 @@ def handler(request: httpx.Request) -> httpx.Response:
             timeout=0.66,
         )
 
-    assert isinstance(response, PdfRestFileBasedResponse)
-    assert response.output_file.name == "async-encrypted.pdf"
+    assert_pdf_file_response(
+        response,
+        expected_name="async-encrypted.pdf",
+        input_file=input_file,
+    )
     timeout_value = captured_timeout["value"]
     assert timeout_value is not None
     if isinstance(timeout_value, dict):
@@ -451,8 +477,11 @@ def handler(request: httpx.Request) -> httpx.Response:
             output="async-rotated-open",
         )
 
-    assert isinstance(response, PdfRestFileBasedResponse)
-    assert response.output_file.name == "async-rotated-open.pdf"
+    assert_pdf_file_response(
+        response,
+        expected_name="async-rotated-open.pdf",
+        input_file=input_file,
+    )
 
 
 @pytest.mark.asyncio
@@ -499,8 +528,11 @@ def handler(request: httpx.Request) -> httpx.Response:
             current_open_password=current_password,
         )
 
-    assert isinstance(response, PdfRestFileBasedResponse)
-    assert response.output_file.name == "async-decrypted.pdf"
+    assert_pdf_file_response(
+        response,
+        expected_name="async-decrypted.pdf",
+        input_file=input_file,
+    )
 
 
 @pytest.mark.asyncio
@@ -562,8 +594,11 @@ def handler(request: httpx.Request) -> httpx.Response:
             timeout=0.63,
         )
 
-    assert isinstance(response, PdfRestFileBasedResponse)
-    assert response.output_file.name == "async-decrypted-custom.pdf"
+    assert_pdf_file_response(
+        response,
+        expected_name="async-decrypted-custom.pdf",
+        input_file=input_file,
+    )
     timeout_value = captured_timeout["value"]
     assert timeout_value is not None
     if isinstance(timeout_value, dict):

tests/test_permissions_password.py

@@ -76,6 +76,20 @@ def build_unrestrict_payload(
     ).model_dump(mode="json", by_alias=True, exclude_none=True, exclude_unset=True)
 
 
+def assert_pdf_file_response(
+    response: PdfRestFileBasedResponse, *, expected_name: str, input_file: PdfRestFile
+) -> None:
+    assert isinstance(response, PdfRestFileBasedResponse)
+    output_file = response.output_file
+    assert output_file.name == expected_name
+    assert output_file.type == "application/pdf"
+    assert output_file.size > 0
+    output_url = str(output_file.url)
+    assert f"/resource/{output_file.id}" in output_url
+    assert response.warning is None
+    assert str(response.input_id) == str(input_file.id)
+
+
 @pytest.mark.parametrize(
     "restrictions",
     [
@@ -139,10 +153,11 @@ def handler(request: httpx.Request) -> httpx.Response:
         )
 
     assert seen == {"post": 1, "get": 1}
-    assert isinstance(response, PdfRestFileBasedResponse)
-    assert response.output_file.name == "restricted.pdf"
-    assert response.output_file.type == "application/pdf"
-    assert str(response.input_id) == str(input_file.id)
+    assert_pdf_file_response(
+        response,
+        expected_name="restricted.pdf",
+        input_file=input_file,
+    )
 
 
 def test_add_permissions_password_request_customization(
@@ -202,8 +217,11 @@ def handler(request: httpx.Request) -> httpx.Response:
             timeout=0.55,
         )
 
-    assert isinstance(response, PdfRestFileBasedResponse)
-    assert response.output_file.name == "custom-restricted.pdf"
+    assert_pdf_file_response(
+        response,
+        expected_name="custom-restricted.pdf",
+        input_file=input_file,
+    )
     timeout_value = captured_timeout["value"]
     assert timeout_value is not None
     if isinstance(timeout_value, dict):
@@ -275,8 +293,11 @@ def handler(request: httpx.Request) -> httpx.Response:
             timeout=0.77,
         )
 
-    assert isinstance(response, PdfRestFileBasedResponse)
-    assert response.output_file.name == "rotated.pdf"
+    assert_pdf_file_response(
+        response,
+        expected_name="rotated.pdf",
+        input_file=input_file,
+    )
     timeout_value = captured_timeout["value"]
     assert timeout_value is not None
     if isinstance(timeout_value, dict):
@@ -335,9 +356,11 @@ def handler(request: httpx.Request) -> httpx.Response:
         )
 
     assert seen == {"post": 1, "get": 1}
-    assert isinstance(response, PdfRestFileBasedResponse)
-    assert response.output_file.name == "clean.pdf"
-    assert response.output_file.type == "application/pdf"
+    assert_pdf_file_response(
+        response,
+        expected_name="clean.pdf",
+        input_file=input_file,
+    )
 
 
 def test_remove_permissions_password_request_customization(
@@ -398,8 +421,11 @@ def handler(request: httpx.Request) -> httpx.Response:
             timeout=0.69,
         )
 
-    assert isinstance(response, PdfRestFileBasedResponse)
-    assert response.output_file.name == "clean-custom.pdf"
+    assert_pdf_file_response(
+        response,
+        expected_name="clean-custom.pdf",
+        input_file=input_file,
+    )
     timeout_value = captured_timeout["value"]
     assert timeout_value is not None
     if isinstance(timeout_value, dict):
@@ -469,10 +495,11 @@ def handler(request: httpx.Request) -> httpx.Response:
         )
 
     assert seen == {"post": 1, "get": 1}
-    assert isinstance(response, PdfRestFileBasedResponse)
-    assert response.output_file.name == "restricted.pdf"
-    assert response.output_file.type == "application/pdf"
-    assert str(response.input_id) == str(input_file.id)
+    assert_pdf_file_response(
+        response,
+        expected_name="restricted.pdf",
+        input_file=input_file,
+    )
 
 
 @pytest.mark.asyncio
@@ -534,8 +561,11 @@ def handler(request: httpx.Request) -> httpx.Response:
             timeout=0.66,
         )
 
-    assert isinstance(response, PdfRestFileBasedResponse)
-    assert response.output_file.name == "async-restricted.pdf"
+    assert_pdf_file_response(
+        response,
+        expected_name="async-restricted.pdf",
+        input_file=input_file,
+    )
     timeout_value = captured_timeout["value"]
     assert timeout_value is not None
     if isinstance(timeout_value, dict):
@@ -608,8 +638,11 @@ def handler(request: httpx.Request) -> httpx.Response:
             timeout=0.88,
         )
 
-    assert isinstance(response, PdfRestFileBasedResponse)
-    assert response.output_file.name == "async-rotated.pdf"
+    assert_pdf_file_response(
+        response,
+        expected_name="async-rotated.pdf",
+        input_file=input_file,
+    )
     timeout_value = captured_timeout["value"]
     assert timeout_value is not None
     if isinstance(timeout_value, dict):
@@ -662,8 +695,11 @@ def handler(request: httpx.Request) -> httpx.Response:
             current_permissions_password=current_password,
         )
 
-    assert isinstance(response, PdfRestFileBasedResponse)
-    assert response.output_file.name == "async-clean.pdf"
+    assert_pdf_file_response(
+        response,
+        expected_name="async-clean.pdf",
+        input_file=input_file,
+    )
 
 
 @pytest.mark.asyncio
@@ -725,8 +761,11 @@ def handler(request: httpx.Request) -> httpx.Response:
             timeout=0.73,
         )
 
-    assert isinstance(response, PdfRestFileBasedResponse)
-    assert response.output_file.name == "async-clean-custom.pdf"
+    assert_pdf_file_response(
+        response,
+        expected_name="async-clean-custom.pdf",
+        input_file=input_file,
+    )
     timeout_value = captured_timeout["value"]
     assert timeout_value is not None
     if isinstance(timeout_value, dict):