diff --git a/tests/data/codelist/stray_tag/char_in_dict/variables.yaml b/tests/data/codelist/stray_tag/char_in_dict/variables.yaml new file mode 100644 index 00000000..ee12f35e --- /dev/null +++ b/tests/data/codelist/stray_tag/char_in_dict/variables.yaml @@ -0,0 +1,13 @@ +- Primary Energy: + definition: Total primary energy consumption + unit: EJ/yr + info: + valid: Valid information. + invalid: Invalid bracket } information. + final: Another valid information. +- Primary Energy|Coal: + definition: Primary energy consumption of coal + unit: EJ/yr +- Share|Coal: + definition: Share of coal in the total primary energy mix + unit: EJ/yr diff --git a/tests/data/codelist/stray_tag/char_in_list/variables.yaml b/tests/data/codelist/stray_tag/char_in_list/variables.yaml new file mode 100644 index 00000000..ea00b19f --- /dev/null +++ b/tests/data/codelist/stray_tag/char_in_list/variables.yaml @@ -0,0 +1,14 @@ +- Primary Energy: + definition: Total primary energy consumption + unit: EJ/yr +- Primary Energy|Coal: + definition: Primary energy consumption of coal + unit: EJ/yr +- Share|Coal: + definition: Share of coal in the total primary energy mix + unit: EJ/yr + info: + - Valid information. + - Invalid bracket { information. + - Another valid information. + diff --git a/tests/data/codelist/stray_tag/definitions/variable/tag_fuel.yaml b/tests/data/codelist/stray_tag/char_in_str/tag_fuel.yaml similarity index 100% rename from tests/data/codelist/stray_tag/definitions/variable/tag_fuel.yaml rename to tests/data/codelist/stray_tag/char_in_str/tag_fuel.yaml diff --git a/tests/data/codelist/stray_tag/definitions/variable/variables.yaml b/tests/data/codelist/stray_tag/char_in_str/variables.yaml similarity index 94% rename from tests/data/codelist/stray_tag/definitions/variable/variables.yaml rename to tests/data/codelist/stray_tag/char_in_str/variables.yaml index 9bc24554..e34cf239 100644 --- a/tests/data/codelist/stray_tag/definitions/variable/variables.yaml +++ b/tests/data/codelist/stray_tag/char_in_str/variables.yaml @@ -6,4 +6,4 @@ unit: EJ/yr - Share|{Fuel}: definition: Share of {Fuel} in the total primary energy mix - unit: + unit: EJ/yr diff --git a/tests/test_codelist.py b/tests/test_codelist.py index 885efd1f..e7a51e43 100644 --- a/tests/test_codelist.py +++ b/tests/test_codelist.py @@ -213,12 +213,24 @@ def test_to_csv(): def test_stray_tag_fails(): - """Check that typos in a tag raises expected error""" + """Check that stray brackets from, e.g. typos in a tag, raises expected error""" + + match = r"Unexpected bracket in codelist: Primary Energy\|{Feul}" + with raises(ValueError, match=match): + VariableCodeList.from_directory( + "variable", MODULE_TEST_DATA_DIR / "stray_tag" / "char_in_str" + ) + + match = r"Unexpected bracket in codelist: Share\|Coal" + with raises(ValueError, match=match): + VariableCodeList.from_directory( + "variable", MODULE_TEST_DATA_DIR / "stray_tag" / "char_in_list" + ) - match = r"Unexpected {} in codelist: Primary Energy\|{Feul}" + match = r"Unexpected bracket in codelist: Primary Energy" with raises(ValueError, match=match): VariableCodeList.from_directory( - "variable", MODULE_TEST_DATA_DIR / "stray_tag" / "definitions" / "variable" + "variable", MODULE_TEST_DATA_DIR / "stray_tag" / "char_in_dict" )