Skip to content

Commit 06e288b

Browse files
committed
fix(test): adapt tests to new search parimeter validate
1 parent d76c2b3 commit 06e288b

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

tests/test_order.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ async def run():
9898
expected_search_kwargs=dict(
9999
productType=collection_id,
100100
provider=None,
101+
validate=True,
101102
**post_data,
102103
),
103104
)
@@ -188,6 +189,7 @@ async def run():
188189
expected_search_kwargs=dict(
189190
productType=collection_id,
190191
provider=None,
192+
validate=True,
191193
**post_data,
192194
),
193195
)
@@ -341,7 +343,7 @@ async def test_order_not_order_id_ko(request_not_found, mock_search, mock_order)
341343
@pytest.mark.parametrize("validate", [True, False])
342344
async def test_order_validate(request_valid, validate):
343345
"""Test product order validation"""
344-
get_settings().validate = validate
346+
get_settings().validate_request = validate
345347
post_data = {"foo": "bar"}
346348
federation_backend = "cop_ads"
347349
collection_id = "CAMS_EAC4"

tests/test_search.py

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ async def test_request_params_valid(request_valid, defaults, input_bbox, expecte
4949
items_per_page=DEFAULT_ITEMS_PER_PAGE,
5050
raise_errors=False,
5151
count=False,
52+
validate=True,
5253
**expected_kwargs,
5354
),
5455
)
@@ -70,6 +71,7 @@ async def test_count_search(request_valid, defaults, mock_search, mock_search_re
7071
items_per_page=DEFAULT_ITEMS_PER_PAGE,
7172
raise_errors=False,
7273
count=False, # Ensure count is set to False
74+
validate=True,
7375
),
7476
)
7577
assert response["numberMatched"] is None
@@ -89,6 +91,7 @@ async def test_count_search(request_valid, defaults, mock_search, mock_search_re
8991
items_per_page=DEFAULT_ITEMS_PER_PAGE,
9092
raise_errors=False,
9193
count=True, # Ensure count is set to True
94+
validate=True,
9295
),
9396
)
9497
assert response["numberMatched"] == 2
@@ -251,6 +254,7 @@ async def test_date_search(request_valid, defaults, input_start, input_end, expe
251254
geom=defaults.bbox_wkt,
252255
raise_errors=False,
253256
count=False,
257+
validate=True,
254258
**expected_kwargs,
255259
),
256260
)
@@ -271,6 +275,7 @@ async def test_date_search_from_items(request_valid, defaults, use_dates):
271275
geom=defaults.bbox_wkt,
272276
raise_errors=False,
273277
count=False,
278+
validate=True,
274279
**expected_kwargs,
275280
),
276281
)
@@ -298,6 +303,7 @@ async def test_sortby_items_parametrize(request_valid, defaults, sortby, expecte
298303
"items_per_page": 10,
299304
"raise_errors": False,
300305
"count": False,
306+
"validate": True,
301307
},
302308
check_links=False,
303309
)
@@ -321,6 +327,7 @@ async def test_search_item_id_from_collection(request_valid, defaults):
321327
expected_search_kwargs={
322328
"id": "foo",
323329
"productType": defaults.product_type,
330+
"validate": True,
324331
},
325332
)
326333

@@ -343,6 +350,7 @@ async def test_cloud_cover_post_search(request_valid, defaults):
343350
geom=defaults.bbox_wkt,
344351
raise_errors=False,
345352
count=False,
353+
validate=True,
346354
),
347355
)
348356

@@ -363,6 +371,7 @@ async def test_intersects_post_search(request_valid, defaults):
363371
geom=defaults.bbox_wkt,
364372
raise_errors=False,
365373
count=False,
374+
validate=True,
366375
),
367376
)
368377

@@ -397,6 +406,7 @@ async def test_date_post_search(request_valid, defaults, input_start, input_end,
397406
items_per_page=DEFAULT_ITEMS_PER_PAGE,
398407
raise_errors=False,
399408
count=False,
409+
validate=True,
400410
**expected_kwargs,
401411
),
402412
)
@@ -416,10 +426,12 @@ async def test_ids_post_search(request_valid, defaults):
416426
{
417427
"id": "foo",
418428
"productType": defaults.product_type,
429+
"validate": True,
419430
},
420431
{
421432
"id": "bar",
422433
"productType": defaults.product_type,
434+
"validate": True,
423435
},
424436
],
425437
)
@@ -523,6 +535,7 @@ async def test_search_provider_in_downloadlink(request_valid, defaults, method,
523535
raise_errors=False,
524536
count=False,
525537
productType=defaults.product_type,
538+
validate=True,
526539
**expected_kwargs,
527540
),
528541
)
@@ -537,7 +550,7 @@ async def test_search_validate(request_valid, defaults, validate):
537550
"""
538551
Test request validation for the search endpoint.
539552
"""
540-
get_settings().validate = validate
553+
get_settings().validate_request = validate
541554

542555
expected_kwargs = {"validate": validate}
543556

0 commit comments

Comments
 (0)