more tests of template filling

opendp · Nov 19, 2024 · 251060c · 251060c
1 parent f93304f
commit 251060c
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 4 deletions.
diff --git a/dp_wizard/utils/code_generators/_template.py b/dp_wizard/utils/code_generators/_template.py
@@ -31,7 +31,8 @@ def fill_expressions(self, **kwargs):
             self._template, count = re.subn(rf"\b{k_re}\b", str(v), self._template)
             if count == 0:
                 raise Exception(
-                    f"No '{k}' slot to fill with '{v}' in '{self._path}':\n\n{self._template}"
+                    f"No '{k}' slot to fill with '{v}' in "
+                    f"'{self._path}':\n\n{self._template}"
                 )
         return self
 
@@ -41,7 +42,8 @@ def fill_values(self, **kwargs):
             self._template, count = re.subn(rf"\b{k_re}\b", repr(v), self._template)
             if count == 0:
                 raise Exception(
-                    f"No '{k}' slot to fill with '{v}' in '{self._path}':\n\n{self._template}"
+                    f"No '{k}' slot to fill with '{v}' in "
+                    f"'{self._path}':\n\n{self._template}"
                 )
         return self
 
@@ -55,12 +57,23 @@ def match_indent(match):
                 )
 
             k_re = re.escape(k)
-            self._template = re.sub(
+            self._template, count = re.subn(
                 rf"^([ \t]*){k_re}$",
                 match_indent,
                 self._template,
                 flags=re.MULTILINE,
             )
+            if count == 0:
+                base_message = (
+                    f"No '{k}' slot to fill with '{v}' in "
+                    f"'{self._path}':\n\n{self._template}"
+                )
+                if k in self._template:
+                    raise Exception(
+                        f"Block slots must be alone on line; {base_message}"
+                    )
+                else:
+                    raise Exception(base_message)
         return self
 
     def __str__(self):

diff --git a/tests/utils/test_code_generators.py b/tests/utils/test_code_generators.py
@@ -1,7 +1,6 @@
 from tempfile import NamedTemporaryFile
 import subprocess
 from pathlib import Path
-import re
 import pytest
 import opendp.prelude as dp
 from dp_wizard.utils.code_generators import (
@@ -133,6 +132,26 @@ def test_fill_blocks():
     )
 
 
+def test_fill_blocks_missing_slot_in_template_alone():
+    template = Template(None, template="No block slot")
+    with pytest.raises(Exception, match=r"No 'SLOT' slot"):
+        str(template.fill_blocks(SLOT="placeholder"))
+
+
+def test_fill_blocks_missing_slot_in_template_not_alone():
+    template = Template(None, template="No block SLOT")
+    with pytest.raises(
+        Exception, match=r"Block slots must be alone on line; No 'SLOT' slot"
+    ):
+        str(template.fill_blocks(SLOT="placeholder"))
+
+
+def test_fill_blocks_extra_slot_in_template():
+    template = Template(None, template="EXTRA\nSLOT")
+    with pytest.raises(Exception, match=r"'EXTRA' slot not filled"):
+        str(template.fill_blocks(SLOT="placeholder"))
+
+
 def test_make_notebook():
     notebook = NotebookGenerator(
         AnalysisPlan(