publicdata/j40-cejst-2
1
0
Fork 0
mirror of https://github.com/DOI-DO/j40-cejst-2.git synced 2025-02-23 01:54:18 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixing tests

Browse source
This commit is contained in:
lucasmbrown-usds 2022-09-09 12:27:28 -04:00
parent 3f98206e6b
commit 5f1fc28a8d
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
data/data-pipeline/data_pipeline/etl/score/etl_utils.py
View file

@ -332,7 +332,10 @@ def compare_to_list_of_expected_state_fips_codes(
continental_us_expected (bool, optional): Do you expect the continental nation continental_us_expected (bool, optional): Do you expect the continental nation
(DC & states except for Alaska and Hawaii) to be represented in data? (DC & states except for Alaska and Hawaii) to be represented in data?
alaska_and_hawaii_expected (bool, optional): Do you expect Alaska and Hawaii alaska_and_hawaii_expected (bool, optional): Do you expect Alaska and Hawaii
to be represented in the data? to be represented in the data? Note: if only *1* of Alaska and Hawaii are
not expected to be included, do not use this argument -- instead,
use `additional_fips_codes_not_expected` for the 1 state you expected to
be missing.
puerto_rico_expected (bool, optional): Do you expect PR to be represented in data? puerto_rico_expected (bool, optional): Do you expect PR to be represented in data?
island_areas_expected (bool, optional): Do you expect Island Areas to be represented in island_areas_expected (bool, optional): Do you expect Island Areas to be represented in
data? data?
@ -365,9 +368,12 @@ def compare_to_list_of_expected_state_fips_codes(
TILES_CONTINENTAL_US_FIPS_CODE TILES_CONTINENTAL_US_FIPS_CODE
) )
# If Alaska and Hawaii are not expected to be included, remove them from the # If both Alaska and Hawaii are not expected to be included, remove them from the
# expected states set. # expected states set.
if not continental_us_expected: # Note: if only *1* of Alaska and Hawaii are not expected to be included,
# do not use this argument -- instead, use `additional_fips_codes_not_expected`
# for the 1 state you expected to be missing.
if not alaska_and_hawaii_expected:
expected_states_set = expected_states_set - set( expected_states_set = expected_states_set - set(
TILES_ALASKA_AND_HAWAII_FIPS_CODE TILES_ALASKA_AND_HAWAII_FIPS_CODE
) )

8
data/data-pipeline/data_pipeline/etl/score/tests/test_etl_utils.py
View file

@ -198,7 +198,7 @@ def test_compare_to_list_of_expected_state_fips_codes():
additional_fips_codes_not_expected=["23", "55"], additional_fips_codes_not_expected=["23", "55"],
) )
# Missing the nation # Missing the continental & AK/HI nation
fips_codes_test_4 = [ fips_codes_test_4 = [
"60", "60",
"66", "66",
@ -223,7 +223,9 @@ def test_compare_to_list_of_expected_state_fips_codes():
assert partial_expected_error_message in str(exception_info.value) assert partial_expected_error_message in str(exception_info.value)
# Should not raise error because Nation is not to be missing # Should not raise error because continental US and AK/HI is not to be missing
compare_to_list_of_expected_state_fips_codes( compare_to_list_of_expected_state_fips_codes(
actual_state_fips_codes=fips_codes_test_4, continental_us_expected=False actual_state_fips_codes=fips_codes_test_4,
continental_us_expected=False,
alaska_and_hawaii_expected=False,
) )