Add exception checking to test_corpus.py;

Fix bug in 'restrict_search_range'

Author: elifarley

src/cedarscript_editor/cedarscript_editor.py

@@ -325,6 +325,10 @@ def restrict_search_range(
                     return inner_boundaries.location_to_search_range(BodyOrWhole.WHOLE)
                 case RangeSpec() as inner_range_spec:
                     return inner_range_spec
+                case None:
+                    raise ValueError(f"Unable to find {region}")
+                case _ as invalid:
+                    raise ValueError(f'Invalid: {invalid}')
         case Segment() as segment:
             return segment.to_search_range(lines, identifier_boundaries.whole if identifier_boundaries is not None else None)
         case _ as invalid:

tests/corpus/update.file.delete.function/1.py

@@ -0,0 +1,2 @@
+def i_exist():
+    pass

tests/corpus/update.file.delete.function/2.py

@@ -0,0 +1,6 @@
+def something():
+    pass
+def i_exist():
+    pass
+def something():
+    pass

tests/corpus/update.file.delete.function/chat.xml

@@ -0,0 +1,10 @@
+<no-train>
+```CEDARScript
+UPDATE FILE "2.py" DELETE FUNCTION "i_exist";
+```
+    <throws value="Unable to find function 'does-not-exist'">
+```CEDARScript
+UPDATE FILE "1.py" DELETE FUNCTION "does-not-exist";
+```
+    </throws>
+</no-train>

tests/corpus/update.file.delete.function/expected.1.py

@@ -0,0 +1,2 @@
+def i_exist():
+    pass

tests/corpus/update.file.delete.function/expected.2.py

@@ -0,0 +1,4 @@
+def something():
+    pass
+def something():
+    pass

tests/test_corpus.py

@@ -1,4 +1,4 @@
-import os
+import re
 import shutil
 import tempfile
 import pytest
@@ -65,23 +65,38 @@ def copy_files(src_dir: Path, dst_dir: Path):
         # Find and apply commands
         commands = list(find_commands(chat_xml))
         assert commands, "No commands found in chat.xml"
-        editor.apply_commands(commands)
+        
+        # Check if test expects an exception
+        throws_match = re.search(r'<throws value="([^"]+)">', chat_xml)
+        if throws_match:
+            expected_error = throws_match.group(1)
+            with pytest.raises(Exception) as excinfo:
+                editor.apply_commands(commands)
+            # TODO excinfo.value is '<description>Unable to find function 'does-not-exist'</description>'
+            actual_error = str(excinfo.value)
+            match re.search(r'<description>(.+)</description>', actual_error):
+                case None:
+                    pass
+                case _ as found:
+                    actual_error = found.group(1)
+            assert actual_error == expected_error, f"Expected error '{expected_error}', but got '{actual_error}'"
+        else:
+            editor.apply_commands(commands)
 
-        # For each file in the scratch directory, check its expected version
         def check_expected_files(dir_path: Path):
             for path in dir_path.iterdir():
                 if path.is_dir():
                     check_expected_files(path)
-                else:
-                    # Find corresponding expected file in test directory
-                    rel_path = path.relative_to(editor.root_path)
-                    expected_file = test_dir / f"expected.{rel_path}"
-                    assert expected_file.exists(), f"Expected file not found: {expected_file}"
+                    continue
+                # Find corresponding expected file in test directory
+                rel_path = path.relative_to(editor.root_path)
+                expected_file = test_dir / f"expected.{rel_path}"
+                assert expected_file.exists(), f"Expected file not found: {expected_file}"
 
-                    expected_content = f"[{rel_path}] \n" + expected_file.read_text()
-                    result_content = f"[{rel_path}] \n" + path.read_text()
-                    assert result_content.strip() == expected_content.strip(), \
-                        f"Output does not match expected content for {rel_path}"
+                expected_content = f"[{rel_path}] \n" + expected_file.read_text()
+                result_content = f"[{rel_path}] \n" + path.read_text()
+                assert result_content.strip() == expected_content.strip(), \
+                    f"Output does not match expected content for {rel_path}"
 
         check_expected_files(editor.root_path)