Update stray tag tests

dc-almeida · Oct 9, 2024 · f7620d5 · f7620d5
1 parent 780198e
commit f7620d5
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 4 deletions.
diff --git a/tests/data/codelist/stray_tag/char_in_dict/variables.yaml 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
@@ -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/...ay_tag/definitions/variable/tag_fuel.yaml → ...elist/stray_tag/char_in_str/tag_fuel.yaml b/...ay_tag/definitions/variable/tag_fuel.yaml → ...elist/stray_tag/char_in_str/tag_fuel.yaml
diff --git a/...y_tag/definitions/variable/variables.yaml → ...list/stray_tag/char_in_str/variables.yaml b/...y_tag/definitions/variable/variables.yaml → ...list/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
@@ -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"
         )