rolls dataset tests into project testing framework

tests/Search/test_search.py

@@ -8,6 +8,7 @@
 from asf_search.ASFSearchResults import ASFSearchResults
 from asf_search.CMR import dataset_collections
 from pytest import raises
+from typing import List
 import requests
 import requests_mock
 
@@ -74,24 +75,19 @@ def custom_matcher(request: requests.Request):
         with raises(ASFSearchError):
             results.raise_if_incomplete()
 
-def test_datasets_search():
-    datasets = ['SENTINEL-1', 'RADARSAT-1', 'UAVSAR']
-    should_raise_error = len([dataset for dataset in datasets if not dataset_collections.get(dataset)]) > 0
-
-    if should_raise_error:
+def run_test_datasets_search(datasets: List):
+    if any(dataset for dataset in datasets if dataset_collections.get(dataset) is None):
         with raises(ValueError):
             search(datasets=datasets, maxResults=1)
-    else:
-        valid_shortnames = []
+    else:    
         for dataset in datasets:
-            valid_shortnames.extend([shortName for shortName in dataset_collections.get(dataset).keys()])
-
-        response = search(datasets=datasets, maxResults=250)
+            valid_shortnames = list(dataset_collections.get(dataset))
 
-        # Get collection shortName of all granules
-        shortNames = list(set([get(product.umm, 'CollectionReference', 'ShortName') for product in response]))
-
-        # and check that results are limited to the expected datasets by their shortname
-        for shortName in shortNames:
-            assert shortName in valid_shortnames
-
+            response = search(datasets=dataset, maxResults=250)
+
+            # Get collection shortName of all granules
+            shortNames = list(set([shortName for product in response if (shortName:=get(product.umm, 'CollectionReference', 'ShortName')) is not None]))
+
+            # and check that results are limited to the expected datasets by their shortname
+            for shortName in shortNames:
+                assert shortName in valid_shortnames

tests/pytest-config.yml

@@ -199,6 +199,11 @@ test_types:
     required_keys: results
     method: test_output_format
 
+- For running datasets keyword tests:
+    required_in_title: search-datasets
+    required_keys: datasets
+    method: test_search_datasets
+
 - For running jupyter notebook example tests:
     required_keys: notebook
     method: test_notebook_examples

tests/pytest-managers.py

@@ -7,7 +7,7 @@
 from ASFSearchResults.test_ASFSearchResults import run_test_output_format, run_test_ASFSearchResults_intersection
 from ASFSession.test_ASFSession import run_auth_with_cookiejar, run_auth_with_creds, run_auth_with_token, run_test_asf_session_rebuild_auth
 from BaselineSearch.test_baseline_search import *
-from Search.test_search import run_test_ASFSearchResults, run_test_search, run_test_search_http_error
+from Search.test_search import run_test_ASFSearchResults, run_test_datasets_search, run_test_search, run_test_search_http_error
 from Search.test_search_generator import run_test_search_generator, run_test_search_generator_multi
 from CMR.test_MissionList import run_test_get_project_names
 
@@ -417,6 +417,10 @@ def test_ASFSearchResults_intersection(**kwargs) -> None:
     wkt = get_resource(kwargs['test_info']['wkt'])
     run_test_ASFSearchResults_intersection(wkt)
 
+def test_search_datasets(**kwargs) -> None:
+    datasets = get_resource(kwargs['test_info']['datasets'])
+    run_test_datasets_search(datasets)
+
 def test_serialization(**args) -> None:
     test_info = args['test_info']
     product = get_resource(test_info.get('product'))

tests/yml_tests/test_search.yml

@@ -42,3 +42,15 @@ tests:
         platform: "Sentinel-1"
     status_code: 500
     report: "Server Error: This is a Test Error"
+
+- test-search-datasets S1 Datasets:
+    datasets: ['SENTINEL-1', 'SLC-BURST', 'OPERA-S1']
+
+- test-search-datasets S1 Datasets and non-S1:
+    datasets: ['SENTINEL-1', 'SLC-BURST', 'OPERA-S1', 'UAVSAR']
+
+- test-search-datasets fake dataset:
+    datasets: 'FAKE-DATASET-V1'
+
+- test-search-datasets S1 Datasets and fake dataset:
+    datasets: ['SENTINEL-1', 'SLC-BURST', 'OPERA-S1', 'FAKE-DATASET-V2']