Rename tests to mostly match dir structure

Author: andrewtavis

tests/cli/contracts/test_cli_contracts_check.py

@@ -74,7 +74,7 @@ def mock_contract_metadata() -> dict[str, Any]:
 
 @patch("scribe_data.cli.contracts.check.check_contract_data_completeness")
 @patch("scribe_data.cli.contracts.check.print_missing_forms")
-def test_check_contracts_with_dir(
+def test_cli_contracts_with_dir(
     mock_print: MagicMock, mock_check: MagicMock, mock_export_dir: Path
 ) -> None:
     """
@@ -90,7 +90,7 @@ def test_check_contracts_with_dir(
 
 @patch("scribe_data.cli.contracts.check.check_contract_data_completeness")
 @patch("scribe_data.cli.contracts.check.print_missing_forms")
-def test_check_contracts_default_dir(
+def test_cli_contracts_default_dir(
     mock_print: MagicMock, mock_check: MagicMock
 ) -> None:
     """
@@ -108,7 +108,7 @@ def test_check_contracts_default_dir(
 
 
 @patch("scribe_data.cli.contracts.check.Path")
-def test_check_contracts_nonexistent_dir(mock_path: MagicMock) -> None:
+def test_cli_contracts_nonexistent_dir(mock_path: MagicMock) -> None:
     """
     Test check_contracts with a nonexistent directory.
     """
@@ -125,7 +125,7 @@ def test_check_contracts_nonexistent_dir(mock_path: MagicMock) -> None:
 @patch("scribe_data.cli.contracts.check.data_contracts_langs", ["English"])
 @patch("scribe_data.cli.contracts.check.get_language_iso")
 @patch("scribe_data.cli.contracts.check.filter_contract_metadata")
-def test_check_contract_data_completeness_json_error(
+def test_cli_contracts_data_completeness_json_error(
     mock_filter_metadata: MagicMock,
     mock_get_iso: MagicMock,
     mock_export_dir: Path,
@@ -148,7 +148,7 @@ def test_check_contract_data_completeness_json_error(
                 assert "Error reading" in mock_print.call_args[0][0]
 
 
-def test_print_missing_forms_none() -> None:
+def test_cli_contracts_print_missing_forms_none() -> None:
     """
     Test print_missing_forms with no missing forms.
     """
@@ -161,7 +161,7 @@ def test_print_missing_forms_none() -> None:
         )
 
 
-def test_print_missing_forms_with_missing() -> None:
+def test_cli_contracts_print_missing_forms_with_missing() -> None:
     """
     Test print_missing_forms with missing forms.
     """

tests/cli/contracts/test_cli_contracts_export.py

@@ -24,7 +24,7 @@ def contracts_source(tmp_path: Path) -> Path:
     return source
 
 
-def test_export_contracts_fresh_export(tmp_path: Path, contracts_source: Path) -> None:
+def test_cli_contracts_export_new(tmp_path: Path, contracts_source: Path) -> None:
     """
     Test fresh export when no existing contracts folder.
     """
@@ -41,7 +41,7 @@ def test_export_contracts_fresh_export(tmp_path: Path, contracts_source: Path) -
     assert (output_dir / "de.yaml").exists()
 
 
-def test_export_contracts_success_message(
+def test_cli_contracts_export_success(
     tmp_path: Path, contracts_source: Path, capsys
 ) -> None:
     """
@@ -59,7 +59,7 @@ def test_export_contracts_success_message(
     assert "successfully exported" in captured.out.lower()
 
 
-def test_export_contracts_overwrite_confirmed(
+def test_cli_contracts_export_overwrite_confirmed(
     tmp_path: Path, contracts_source: Path
 ) -> None:
     """
@@ -82,7 +82,7 @@ def test_export_contracts_overwrite_confirmed(
     assert not (output_dir / "old.yaml").exists()
 
 
-def test_export_contracts_overwrite_declined(
+def test_cli_contracts_export_overwrite_declined(
     tmp_path: Path, contracts_source: Path, capsys
 ) -> None:
     """
@@ -106,7 +106,7 @@ def test_export_contracts_overwrite_declined(
     assert (output_dir / "old.yaml").exists()
 
 
-def test_export_contracts_source_not_found(tmp_path: Path) -> None:
+def test_cli_contracts_export_source_not_found(tmp_path: Path) -> None:
     """
     Test assertion error when source directory not found.
     """
@@ -121,7 +121,9 @@ def test_export_contracts_source_not_found(tmp_path: Path) -> None:
             export_contracts(output_dir=output_dir)
 
 
-def test_export_contracts_files_content(tmp_path: Path, contracts_source: Path) -> None:
+def test_cli_contracts_export_files_content(
+    tmp_path: Path, contracts_source: Path
+) -> None:
     """
     Test that exported files have correct content.
     """
@@ -137,7 +139,7 @@ def test_export_contracts_files_content(tmp_path: Path, contracts_source: Path)
     assert (output_dir / "de.yaml").read_text() == "language: german\n"
 
 
-def test_export_contracts_overwrite_default_declined(
+def test_cli_contracts_export_overwrite_default_declined(
     tmp_path: Path, contracts_source: Path, capsys
 ) -> None:
     """

tests/cli/contracts/test_cli_contracts_filter.py

@@ -19,7 +19,7 @@
 
 
 class TestFilterContractMetadata:
-    def test_filter_contract_metadata_empty_file(self) -> None:
+    def test_cli_contracts_filter_metadata_empty_file(self) -> None:
         """
         Test filtering with an empty contract file.
         """
@@ -31,7 +31,7 @@ def test_filter_contract_metadata_empty_file(self) -> None:
                 "verbs": {"conjugations": []},
             }
 
-    def test_filter_contract_metadata_numbers_dict(self) -> None:
+    def test_cli_contracts_filter_metadata_numbers_dict(self) -> None:
         """
         Test filtering numbers as a dictionary.
         """
@@ -48,7 +48,7 @@ def test_filter_contract_metadata_numbers_dict(self) -> None:
             assert "" not in result["nouns"]["numbers"]
             assert "collective" in result["nouns"]["numbers"]
 
-    def test_filter_contract_metadata_numbers_list(self) -> None:
+    def test_cli_contracts_filter_metadata_numbers_list(self) -> None:
         """
         Test filtering numbers as a list.
         """
@@ -61,7 +61,7 @@ def test_filter_contract_metadata_numbers_list(self) -> None:
             result = filter_contract_metadata(Path("fake_path.json"))
             assert set(result["nouns"]["numbers"]) == {"singular", "plural", "dual"}
 
-    def test_filter_contract_metadata_numbers_string(self) -> None:
+    def test_cli_contracts_filter_metadata_numbers_string(self) -> None:
         """
         Test filtering numbers as a string.
         """
@@ -74,7 +74,7 @@ def test_filter_contract_metadata_numbers_string(self) -> None:
             result = filter_contract_metadata(Path("fake_path.json"))
             assert set(result["nouns"]["numbers"]) == {"singular", "plural", "dual"}
 
-    def test_filter_contract_metadata_genders(self) -> None:
+    def test_cli_contracts_filter_metadata_genders(self) -> None:
         """
         Test filtering genders.
         """
@@ -93,7 +93,7 @@ def test_filter_contract_metadata_genders(self) -> None:
             assert "NOT_INCLUDED" not in result["nouns"]["genders"]
             assert "" not in result["nouns"]["genders"]
 
-    def test_filter_contract_metadata_conjugations_list(self) -> None:
+    def test_cli_contracts_filter_metadata_conjugations_list(self) -> None:
         """
         Test filtering conjugations as a list.
         """
@@ -107,7 +107,7 @@ def test_filter_contract_metadata_conjugations_list(self) -> None:
             assert set(result["verbs"]["conjugations"]) == {"run", "runs", "ran"}
             assert "[running]" not in result["verbs"]["conjugations"]
 
-    def test_filter_contract_metadata_error_handling(self) -> None:
+    def test_cli_contracts_filter_metadata_error_handling(self) -> None:
         """
         Test error handling for invalid YAML.
         """
@@ -119,7 +119,7 @@ def test_filter_contract_metadata_error_handling(self) -> None:
 
 
 class TestFilterExportedData:
-    def test_filter_exported_data_nouns(self) -> None:
+    def test_cli_contracts_filter_exported_data_nouns(self) -> None:
         """
         Test filtering exported noun data.
         """
@@ -169,7 +169,7 @@ def test_filter_exported_data_nouns(self) -> None:
             assert result["L2"]["singular"] == "dog"
             assert "irrelevant" not in result["L2"]
 
-    def test_filter_exported_data_verbs(self) -> None:
+    def test_cli_contracts_filter_exported_data_verbs(self) -> None:
         """
         Test filtering exported verb data.
         """
@@ -211,7 +211,7 @@ def test_filter_exported_data_verbs(self) -> None:
             # L4 should not be included as it doesn't have enough valid fields.
             assert "L4" not in result
 
-    def test_filter_exported_data_unsupported_type(self) -> None:
+    def test_cli_contracts_filter_exported_data_unsupported_type(self) -> None:
         """
         Test filtering with unsupported data type.
         """
@@ -226,7 +226,7 @@ def test_filter_exported_data_unsupported_type(self) -> None:
             )
             assert result == {}
 
-    def test_filter_exported_data_error_handling(self) -> None:
+    def test_cli_contracts_filter_exported_data_error_handling(self) -> None:
         """
         Test error handling for invalid JSON.
         """
@@ -253,7 +253,7 @@ class TestExportContracts:
     @patch("pathlib.Path.exists")
     @patch("builtins.open", new_callable=mock_open)
     @patch("json.dump")
-    def test_export_data_filtered_by_contracts(
+    def test_cli_contracts_export_data_filtered(
         self,
         mock_json_dump: MagicMock,
         mock_file_open: MagicMock,
@@ -361,7 +361,7 @@ def mock_path_glob(self: Path, pattern: str) -> list[Path]:
     @patch("scribe_data.cli.contracts.filter.get_language_from_iso")
     @patch("os.listdir")
     @patch("pathlib.Path.mkdir")
-    def test_export_data_filtered_by_contracts_no_language_match(
+    def test_cli_contracts_export_data_filtered_no_language_match(
         self,
         mock_mkdir: MagicMock,
         mock_listdir: MagicMock,
@@ -394,7 +394,7 @@ def test_export_data_filtered_by_contracts_no_language_match(
     @patch("os.listdir")
     @patch("pathlib.Path.mkdir")
     @patch("pathlib.Path.exists")
-    def test_export_data_filtered_by_contracts_no_input_file(
+    def test_cli_contracts_export_data_filtered_no_input_file(
         self,
         mock_exists: MagicMock,
         mock_mkdir: MagicMock,
@@ -428,7 +428,7 @@ def test_export_data_filtered_by_contracts_no_input_file(
     @patch("scribe_data.cli.contracts.filter.get_language_from_iso")
     @patch("os.listdir")
     @patch("pathlib.Path.mkdir")
-    def test_export_data_filtered_by_contracts_empty_metadata(
+    def test_cli_contracts_export_data_filtered_empty_metadata(
         self,
         mock_mkdir: MagicMock,
         mock_listdir: MagicMock,

tests/cli/convert/test_cli_convert_to_csv_or_tsv.py

@@ -17,7 +17,7 @@ class TestCLIConvertToCSVorTSV(unittest.TestCase):
     def _setup_fixtures(self, tmp_path):
         self.tmp_path = tmp_path
 
-    def test_convert_to_csv_or_json_empty_language(self) -> None:
+    def test_cli_convert_to_csv_or_json_empty_language(self) -> None:
         json_data = '{"key1": "value1", "key2": "value2"}'
 
         input_file = self.tmp_path / "test.json"
@@ -37,7 +37,7 @@ def test_convert_to_csv_or_json_empty_language(self) -> None:
 
         self.assertEqual(str(context.exception), "Language '' is not recognized.")
 
-    def test_convert_to_csv_or_tsv_standard_dict_to_csv(self) -> None:
+    def test_cli_convert_to_csv_or_tsv_standard_dict_to_csv(self) -> None:
         json_data = '{"a": "1", "b": "2"}'
         expected_csv_output = "preposition,value\na,1\nb,2\n"
 
@@ -59,7 +59,7 @@ def test_convert_to_csv_or_tsv_standard_dict_to_csv(self) -> None:
         actual_content = output_file.read_text(encoding="utf-8")
         assert actual_content == expected_csv_output
 
-    def test_convert_to_csv_or_tsv_standard_dict_to_tsv(self) -> None:
+    def test_cli_convert_to_csv_or_tsv_standard_dict_to_tsv(self) -> None:
         json_data = '{"a": "1", "b": "2"}'
         expected_tsv_output = "preposition\tvalue\na\t1\nb\t2\n"
 
@@ -81,7 +81,7 @@ def test_convert_to_csv_or_tsv_standard_dict_to_tsv(self) -> None:
         actual_content = output_file.read_text(encoding="utf-8")
         assert actual_content == expected_tsv_output
 
-    def test_convert_to_csv_or_tsv_nested_dict_to_csv(self) -> None:
+    def test_cli_convert_to_csv_or_tsv_nested_dict_to_csv(self) -> None:
         json_data = (
             '{"a": {"value1": "1", "value2": "x"}, "b": {"value1": "2", "value2": "y"}}'
         )
@@ -105,7 +105,7 @@ def test_convert_to_csv_or_tsv_nested_dict_to_csv(self) -> None:
         actual_content = output_file.read_text(encoding="utf-8")
         assert actual_content == expected_csv_output
 
-    def test_convert_to_csv_or_tsv_nested_dict_to_tsv(self) -> None:
+    def test_cli_convert_to_csv_or_tsv_nested_dict_to_tsv(self) -> None:
         json_data = (
             '{"a": {"value1": "1", "value2": "x"}, "b": {"value1": "2", "value2": "y"}}'
         )
@@ -129,7 +129,7 @@ def test_convert_to_csv_or_tsv_nested_dict_to_tsv(self) -> None:
         actual_content = output_file.read_text(encoding="utf-8")
         assert actual_content == expected_tsv_output
 
-    def test_convert_to_csv_or_tsv_list_of_dicts_to_csv(self) -> None:
+    def test_cli_convert_to_csv_or_tsv_list_of_dicts_to_csv(self) -> None:
         json_data = '{"a": [{"emoji": "😀", "is_base": true, "rank": 1}, {"emoji": "😅", "is_base": false, "rank": 2}]}'
         expected_csv_output = "word,emoji,is_base,rank\na,😀,True,1\na,😅,False,2\n"
 
@@ -151,7 +151,7 @@ def test_convert_to_csv_or_tsv_list_of_dicts_to_csv(self) -> None:
         actual_content = output_file.read_text(encoding="utf-8")
         assert actual_content == expected_csv_output
 
-    def test_convert_to_csv_or_tsv_list_of_dicts_to_tsv(self) -> None:
+    def test_cli_convert_to_csv_or_tsv_list_of_dicts_to_tsv(self) -> None:
         json_data = '{"a": [{"emoji": "😀", "is_base": true, "rank": 1}, {"emoji": "😅", "is_base": false, "rank": 2}]}'
         expected_tsv_output = (
             "word\temoji\tis_base\trank\na\t😀\tTrue\t1\na\t😅\tFalse\t2\n"

tests/cli/convert/test_cli_convert_to_json.py

@@ -21,8 +21,8 @@ class TestCLIConvertToJSON(unittest.TestCase):
     def _setup_fixtures(self, tmp_path):
         self.tmp_path = tmp_path
 
-    @patch("scribe_data.cli.convert.Path", autospec=True)
-    def test_convert_to_json_empty_language(self, mock_path: MagicMock) -> None:
+    @patch("scribe_data.cli.convert.to_json.Path", autospec=True)
+    def test_cli_convert_to_json_empty_language(self, mock_path: MagicMock) -> None:
         csv_data = "key,value\na,1\nb,2"
         mock_file = StringIO(csv_data)
 
@@ -43,8 +43,8 @@ def test_convert_to_json_empty_language(self, mock_path: MagicMock) -> None:
             )
         self.assertIn("Language '' is not recognized.", str(context.exception))
 
-    @patch("scribe_data.cli.convert.Path", autospec=True)
-    def test_convert_to_json_supported_file_extension_csv(
+    @patch("scribe_data.cli.convert.to_json.Path", autospec=True)
+    def test_cli_convert_to_json_supported_file_extension_csv(
         self, mock_path_class: MagicMock
     ) -> None:
         mock_path_instance = MagicMock(spec=Path)
@@ -63,8 +63,8 @@ def test_convert_to_json_supported_file_extension_csv(
             overwrite=True,
         )
 
-    @patch("scribe_data.cli.convert.Path", autospec=True)
-    def test_convert_to_json_supported_file_extension_tsv(
+    @patch("scribe_data.cli.convert.to_json.Path", autospec=True)
+    def test_cli_convert_to_json_supported_file_extension_tsv(
         self, mock_path_class: MagicMock
     ) -> None:
         mock_path_instance = MagicMock(spec=Path)
@@ -83,7 +83,7 @@ def test_convert_to_json_supported_file_extension_tsv(
             overwrite=True,
         )
 
-    def test_convert_to_json_unsupported_file_extension(self) -> None:
+    def test_cli_convert_to_json_unsupported_file_extension(self) -> None:
         input_file = self.tmp_path / "test.txt"
         input_file.write_text("Hello, world!", encoding="utf-8")
         output_dir = self.tmp_path / "output"
@@ -105,7 +105,7 @@ def test_convert_to_json_unsupported_file_extension(self) -> None:
             f"Unsupported file extension '.txt' for {input_file}. Please provide a '.csv' or '.tsv' file.",
         )
 
-    def test_convert_to_json_standard_csv(self) -> None:
+    def test_cli_convert_to_json_standard_csv(self) -> None:
         csv_data = "key,value\na,1\nb,2"
         expected_json_output = {"a": "1", "b": "2"}
 
@@ -129,7 +129,7 @@ def test_convert_to_json_standard_csv(self) -> None:
 
         assert actual_content == expected_json_output
 
-    def test_convert_to_json_with_multiple_keys(self) -> None:
+    def test_cli_convert_to_json_with_multiple_keys(self) -> None:
         csv_data = "key,value1,value2\na,1,x\nb,2,y\nc,3,z"
         expected_json_output = {
             "a": {"value1": "1", "value2": "x"},
@@ -157,7 +157,7 @@ def test_convert_to_json_with_multiple_keys(self) -> None:
 
         assert actual_content == expected_json_output
 
-    def test_convert_to_json_with_complex_structure(self) -> None:
+    def test_cli_convert_to_json_with_complex_structure(self) -> None:
         csv_data = "key,emoji,is_base,rank\na,😀,true,1\nb,😅,false,2"
         expected_json_output = {
             "a": [{"emoji": "😀", "is_base": True, "rank": 1}],