tests: Round out test image formats with new inputs

Assisted-by: Codex

Author: datalogics-cgreen

tests/live/test_live_add_image_to_pdf.py

@@ -7,6 +7,13 @@
 
 from ..resources import get_test_resource_path
 
+IMAGE_RESOURCE_VARIANTS = (
+    pytest.param(("test.jpg", "image/jpeg"), id="jpeg"),
+    pytest.param(("test.png", "image/png"), id="png"),
+    pytest.param(("test.tif", "image/tiff"), id="tiff"),
+    pytest.param(("test.gif", "image/gif"), id="gif"),
+)
+
 
 @pytest.fixture(scope="module")
 def uploaded_pdf_for_image_addition(
@@ -21,32 +28,37 @@ def uploaded_pdf_for_image_addition(
         return client.files.create_from_paths([resource])[0]
 
 
-@pytest.fixture(scope="module")
-def uploaded_image(
+@pytest.fixture(scope="module", params=IMAGE_RESOURCE_VARIANTS)
+def uploaded_image_variant(
+    request: pytest.FixtureRequest,
     pdfrest_api_key: str,
     pdfrest_live_base_url: str,
 ) -> PdfRestFile:
-    resource = get_test_resource_path("ducky.png")
+    resource_name, expected_mime = request.param
+    resource = get_test_resource_path(resource_name)
     with PdfRestClient(
         api_key=pdfrest_api_key,
         base_url=pdfrest_live_base_url,
     ) as client:
-        return client.files.create_from_paths([resource])[0]
+        uploaded_image = client.files.create_from_paths([resource])[0]
+
+    assert uploaded_image.type == expected_mime
+    return uploaded_image
 
 
 def test_live_add_image_to_pdf(
     pdfrest_api_key: str,
     pdfrest_live_base_url: str,
     uploaded_pdf_for_image_addition: PdfRestFile,
-    uploaded_image: PdfRestFile,
+    uploaded_image_variant: PdfRestFile,
 ) -> None:
     with PdfRestClient(
         api_key=pdfrest_api_key,
         base_url=pdfrest_live_base_url,
     ) as client:
         response = client.add_image_to_pdf(
             uploaded_pdf_for_image_addition,
-            image=uploaded_image,
+            image=uploaded_image_variant,
             x=25,
             y=50,
             page=1,
@@ -60,23 +72,23 @@ def test_live_add_image_to_pdf(
     assert output_file.size > 0
     assert response.warning is None
     assert uploaded_pdf_for_image_addition.id in response.input_ids
-    assert uploaded_image.id in response.input_ids
+    assert uploaded_image_variant.id in response.input_ids
 
 
 @pytest.mark.asyncio
 async def test_live_async_add_image_to_pdf(
     pdfrest_api_key: str,
     pdfrest_live_base_url: str,
     uploaded_pdf_for_image_addition: PdfRestFile,
-    uploaded_image: PdfRestFile,
+    uploaded_image_variant: PdfRestFile,
 ) -> None:
     async with AsyncPdfRestClient(
         api_key=pdfrest_api_key,
         base_url=pdfrest_live_base_url,
     ) as client:
         response = await client.add_image_to_pdf(
             uploaded_pdf_for_image_addition,
-            image=uploaded_image,
+            image=uploaded_image_variant,
             x=75,
             y=125,
             page=1,
@@ -88,14 +100,14 @@ async def test_live_async_add_image_to_pdf(
     assert output_file.size > 0
     assert response.warning is None
     assert uploaded_pdf_for_image_addition.id in response.input_ids
-    assert uploaded_image.id in response.input_ids
+    assert uploaded_image_variant.id in response.input_ids
 
 
 def test_live_add_image_to_pdf_invalid_page(
     pdfrest_api_key: str,
     pdfrest_live_base_url: str,
     uploaded_pdf_for_image_addition: PdfRestFile,
-    uploaded_image: PdfRestFile,
+    uploaded_image_variant: PdfRestFile,
 ) -> None:
     with (
         PdfRestClient(
@@ -106,7 +118,7 @@ def test_live_add_image_to_pdf_invalid_page(
     ):
         client.add_image_to_pdf(
             uploaded_pdf_for_image_addition,
-            image=uploaded_image,
+            image=uploaded_image_variant,
             x=0,
             y=0,
             page=1,
@@ -119,7 +131,7 @@ async def test_live_async_add_image_to_pdf_invalid_page(
     pdfrest_api_key: str,
     pdfrest_live_base_url: str,
     uploaded_pdf_for_image_addition: PdfRestFile,
-    uploaded_image: PdfRestFile,
+    uploaded_image_variant: PdfRestFile,
 ) -> None:
     async with AsyncPdfRestClient(
         api_key=pdfrest_api_key,
@@ -128,7 +140,7 @@ async def test_live_async_add_image_to_pdf_invalid_page(
         with pytest.raises(PdfRestApiError, match=r"(?i)page"):
             await client.add_image_to_pdf(
                 uploaded_pdf_for_image_addition,
-                image=uploaded_image,
+                image=uploaded_image_variant,
                 x=0,
                 y=0,
                 page=1,

tests/resources/test.gif

@@ -18,12 +18,26 @@
     make_pdf_file,
 )
 
+IMAGE_MIME_VARIANTS = (
+    pytest.param("image/jpeg", "logo.jpg", id="jpeg"),
+    pytest.param("image/png", "logo.png", id="png"),
+    pytest.param("image/tiff", "logo.tif", id="tiff"),
+    pytest.param("image/gif", "logo.gif", id="gif"),
+)
+
 
-def test_add_image_to_pdf_success(monkeypatch: pytest.MonkeyPatch) -> None:
+@pytest.mark.parametrize(("image_mime_type", "image_name"), IMAGE_MIME_VARIANTS)
+def test_add_image_to_pdf_success(
+    monkeypatch: pytest.MonkeyPatch,
+    image_mime_type: str,
+    image_name: str,
+) -> None:
     monkeypatch.delenv("PDFREST_API_KEY", raising=False)
     pdf_file = make_pdf_file(PdfRestFileID.generate(1))
     image_file = make_image_file(
-        PdfRestFileID.generate(2), mime_type="image/jpeg", name="logo.jpg"
+        PdfRestFileID.generate(2),
+        mime_type=image_mime_type,
+        name=image_name,
     )
     output_id = str(PdfRestFileID.generate())
 
@@ -266,12 +280,19 @@ def handler(_: httpx.Request) -> httpx.Response:
 
 
 @pytest.mark.asyncio
+@pytest.mark.parametrize(("image_mime_type", "image_name"), IMAGE_MIME_VARIANTS)
 async def test_async_add_image_to_pdf_success(
     monkeypatch: pytest.MonkeyPatch,
+    image_mime_type: str,
+    image_name: str,
 ) -> None:
     monkeypatch.delenv("PDFREST_API_KEY", raising=False)
     pdf_file = make_pdf_file(PdfRestFileID.generate(1))
-    image_file = make_image_file(PdfRestFileID.generate(2), mime_type="image/gif")
+    image_file = make_image_file(
+        PdfRestFileID.generate(2),
+        mime_type=image_mime_type,
+        name=image_name,
+    )
     output_id = str(PdfRestFileID.generate())
 
     seen: dict[str, int] = {"post": 0, "get": 0}