From 72f016a5b293ece5a09a88fe7420e2fae36a2187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9cile=20Vuilleumier?= Date: Thu, 13 Nov 2025 10:54:11 +0100 Subject: [PATCH] Use get_map method where possible --- acceptance_tests/tests/test_cog.py | 14 ++--- acceptance_tests/tests/test_imagemosaic.py | 53 ++++++++++++------- .../tests/test_imagemosaic_cog.py | 10 ++-- 3 files changed, 49 insertions(+), 28 deletions(-) diff --git a/acceptance_tests/tests/test_cog.py b/acceptance_tests/tests/test_cog.py index 2e315135..ed6ea9de 100644 --- a/acceptance_tests/tests/test_cog.py +++ b/acceptance_tests/tests/test_cog.py @@ -1,13 +1,9 @@ -WORKSPACE = "cog" - - def test_create_cog_coverage(geoserver_factory): """Test creating a COG coverage store and coverage""" workspace = "cog" store_name = "land_shallow_topo_21600_NW_cog" coverage_name = "land_shallow_topo_NW" geoserver = geoserver_factory(workspace) - rest_client = geoserver.rest_service.rest_client # Create COG coverage store content, status = geoserver.create_coverage_store( @@ -45,8 +41,12 @@ def test_create_cog_coverage(geoserver_factory): assert content.get("enabled") is True # Test WMS GetMap request - wms_response = rest_client.get( - f"/wms?SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&LAYERS={workspace}:{coverage_name}&STYLES=&BBOX=-180,-90,180,90&WIDTH=256&HEIGHT=256&FORMAT=image/jpeg&SRS=EPSG:4326" - ) + wms_response = geoserver.get_map( + layers=[f"{workspace}:{coverage_name}"], + bbox=(-180, -90, 180, 90), + size=(256, 256), + srs="EPSG:4326", + format="image/jpeg", + )._response assert wms_response.status_code == 200 assert wms_response.headers.get("content-type").startswith("image/jpeg") diff --git a/acceptance_tests/tests/test_imagemosaic.py b/acceptance_tests/tests/test_imagemosaic.py index 38d10b41..c91385d3 100644 --- a/acceptance_tests/tests/test_imagemosaic.py +++ b/acceptance_tests/tests/test_imagemosaic.py @@ -50,9 +50,13 @@ def test_create_imagemosaic_local_files(geoserver_factory): assert coverage_data.get("enabled") == True # Test WMS GetMap request (verify local file mosaic works) - wms_response = geoserver.rest_service.rest_client.get( - f"/wms?SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&LAYERS={workspace}:{coverage_name}&STYLES=&BBOX=-180,-90,180,90&WIDTH=256&HEIGHT=256&FORMAT=image/png&SRS=EPSG:4326" - ) + wms_response = geoserver.get_map( + layers=[f"{workspace}:{coverage_name}"], + bbox=(-180, -90, 180, 90), + size=(256, 256), + srs="EPSG:4326", + format="image/png", + )._response assert wms_response.status_code == 200, f"WMS GetMap failed: {wms_response.text}" assert wms_response.headers.get("content-type").startswith("image/png") @@ -166,9 +170,13 @@ preparedStatements=false assert coverage_data.get("title") == "Manual Granules Test Coverage" # Test WMS GetMap request (verify manual granule addition works) - wms_response = geoserver.rest_service.rest_client.get( - f"/wms?SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&LAYERS={workspace}:{coverage_name}&STYLES=&BBOX=-180,-90,180,90&WIDTH=256&HEIGHT=256&FORMAT=image/png&SRS=EPSG:4326" - ) + wms_response = geoserver.get_map( + layers=[f"{workspace}:{coverage_name}"], + bbox=(-180, -90, 180, 90), + size=(256, 256), + srs="EPSG:4326", + format="image/png", + )._response assert wms_response.status_code == 200, f"WMS GetMap failed: {wms_response.text}" assert wms_response.headers.get("content-type").startswith("image/png") @@ -274,10 +282,13 @@ preparedStatements=false assert coverage_data.get("title") == "Directory Harvest Test Coverage" # Step 7: Test WMS GetMap request - wms_response = geoserver.rest_service.rest_client.get( - f"/wms?SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&LAYERS={workspace}:{coverage_name}" - f"&STYLES=&BBOX=-180,-90,180,90&WIDTH=256&HEIGHT=256&FORMAT=image/png&SRS=EPSG:4326" - ) + wms_response = geoserver.get_map( + layers=[f"{workspace}:{coverage_name}"], + bbox=(-180, -90, 180, 90), + size=(256, 256), + srs="EPSG:4326", + format="image/png", + )._response assert wms_response.status_code == 200, f"WMS GetMap failed: {wms_response.text}" assert wms_response.headers.get("content-type").startswith("image/png") @@ -377,10 +388,13 @@ preparedStatements=false assert content.get("title") == "Single File Harvest Test Coverage" # Verify WMS works - wms_response = geoserver.rest_service.rest_client.get( - f"/wms?SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&LAYERS={workspace}:{coverage_name}" - f"&STYLES=&BBOX=-180,-90,180,90&WIDTH=256&HEIGHT=256&FORMAT=image/png&SRS=EPSG:4326" - ) + wms_response = geoserver.get_map( + layers=[f"{workspace}:{coverage_name}"], + bbox=(-180, -90, 180, 90), + size=(256, 256), + srs="EPSG:4326", + format="image/png", + )._response assert wms_response.status_code == 200, f"WMS GetMap failed: {wms_response.text}" assert wms_response.headers.get("content-type").startswith("image/png") @@ -428,9 +442,12 @@ def test_create_imagemosaic_via_store_definition(geoserver_factory): assert content.get("title") == "JSON Store Creation Test Coverage" # Verify WMS works - wms_response = geoserver.rest_service.rest_client.get( - f"/wms?SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&LAYERS={workspace}:{coverage_name}" - f"&STYLES=&BBOX=-180,-90,180,90&WIDTH=256&HEIGHT=256&FORMAT=image/png&SRS=EPSG:4326" - ) + wms_response = geoserver.get_map( + layers=[f"{workspace}:{coverage_name}"], + bbox=(-180, -90, 180, 90), + size=(256, 256), + srs="EPSG:4326", + format="image/png", + )._response assert wms_response.status_code == 200, f"WMS GetMap failed: {wms_response.text}" assert wms_response.headers.get("content-type").startswith("image/png") diff --git a/acceptance_tests/tests/test_imagemosaic_cog.py b/acceptance_tests/tests/test_imagemosaic_cog.py index a3daeac3..9e422cfe 100644 --- a/acceptance_tests/tests/test_imagemosaic_cog.py +++ b/acceptance_tests/tests/test_imagemosaic_cog.py @@ -108,9 +108,13 @@ preparedStatements=false assert coverage_data["title"] == title # Test WMS GetMap request - wms_response = geoserver.rest_service.rest_client.get( - f"/wms?SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&LAYERS={workspace}:{coverage}&STYLES=&BBOX=-180,-90,180,90&WIDTH=256&HEIGHT=256&FORMAT=image/png&SRS=EPSG:4326" - ) + wms_response = geoserver.get_map( + layers=[f"{workspace}:{coverage}"], + bbox=(-180, -90, 180, 90), + size=(256, 256), + srs="EPSG:4326", + format="image/png", + )._response assert wms_response.status_code == 200 assert wms_response.headers.get("content-type").startswith("image/png")