@@ -475,34 +475,23 @@ def test_write_and_read_from_two_files(self, nc_filename, nc_filename_i):
475
475
scn_ .load (["solar_zenith_angle" ], resolution = 371 )
476
476
assert scn_ ["solar_zenith_angle" ].attrs ["resolution" ] == 371
477
477
478
- def test_dataid_attrs_equal_matching_dataset (self , cf_scene , nc_filename ):
479
- """Check that get_dataset returns valid dataset when keys matches."""
478
+ @pytest .mark .parametrize (
479
+ ("data_id_kwargs" , "exp_match" ),
480
+ [
481
+ ({"name" : "solar_zenith_angle" , "resolution" : 742 , "modifiers" : ()}, True ),
482
+ ({"name" : "solar_zenith_angle" , "resolution" : 9999999 , "modifiers" : ()}, False ),
483
+ ({"name" : "solar_zenith_angle" , "resolution" : 742 , "modifiers" : (), "calibration" : "counts" }, True ),
484
+ ],
485
+ )
486
+ def test_dataid_attrs_equal_matching_dataset (self , cf_scene , nc_filename , data_id_kwargs , exp_match ):
487
+ """Check that get_dataset returns valid dataset when keys match."""
480
488
from satpy .dataset .dataid import DataID
481
489
from satpy .dataset .id_keys import default_id_keys_config
482
490
_create_test_netcdf (nc_filename , resolution = 742 )
483
491
reader = SatpyCFFileHandler (nc_filename , {}, {"filetype" : "info" })
484
- ds_id = DataID (default_id_keys_config , name = "solar_zenith_angle" , resolution = 742 , modifiers = () )
492
+ ds_id = DataID (default_id_keys_config , ** data_id_kwargs )
485
493
res = reader .get_dataset (ds_id , {})
486
- assert res .attrs ["resolution" ] == 742
487
-
488
- def test_dataid_attrs_equal_not_matching_dataset (self , cf_scene , nc_filename ):
489
- """Check that get_dataset returns None when key(s) are not matching."""
490
- from satpy .dataset .dataid import DataID
491
- from satpy .dataset .id_keys import default_id_keys_config
492
- _create_test_netcdf (nc_filename , resolution = 742 )
493
- reader = SatpyCFFileHandler (nc_filename , {}, {"filetype" : "info" })
494
- not_existing_resolution = 9999999
495
- ds_id = DataID (default_id_keys_config , name = "solar_zenith_angle" , resolution = not_existing_resolution ,
496
- modifiers = ())
497
- assert reader .get_dataset (ds_id , {}) is None
498
-
499
- def test_dataid_attrs_equal_contains_not_matching_key (self , cf_scene , nc_filename ):
500
- """Check that get_dataset returns valid dataset when dataid have key(s) not existing in data."""
501
- from satpy .dataset .dataid import DataID
502
- from satpy .dataset .id_keys import default_id_keys_config
503
- _create_test_netcdf (nc_filename , resolution = 742 )
504
- reader = SatpyCFFileHandler (nc_filename , {}, {"filetype" : "info" })
505
- ds_id = DataID (default_id_keys_config , name = "solar_zenith_angle" , resolution = 742 ,
506
- modifiers = (), calibration = "counts" )
507
- res = reader .get_dataset (ds_id , {})
508
- assert res .attrs ["resolution" ] == 742
494
+ if not exp_match :
495
+ assert res is None
496
+ else :
497
+ assert res .attrs ["resolution" ] == 742
0 commit comments