Skip to content

Commit c72a891

Browse files
andrewtavisandrewtavis
committed
Further test fixes
1 parent cfbccf9 commit c72a891

6 files changed

Lines changed: 32 additions & 22 deletions

‎tests/cli/interactive/test_cli_interactive_config.py‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ def test_cli_interactive_config_initialization(self) -> None:
3232
self.assertFalse(self.config.overwrite)
3333
self.assertFalse(self.config.configured)
3434

35-
@patch("scribe_data.cli.interactive.config.prompt")
36-
@patch("scribe_data.cli.interactive.config.rprint")
35+
@patch("scribe_data.cli.interactive.run.prompt")
36+
@patch("scribe_data.cli.interactive.run.rprint")
3737
def test_cli_interactive_configure_settings_all_languages(
3838
self, mock_rprint: MagicMock, mock_prompt: MagicMock
3939
) -> None:
@@ -52,17 +52,19 @@ def test_cli_interactive_configure_settings_all_languages(
5252
)
5353
mock_prompt.side_effect = lambda *args, **kwargs: next(responses)
5454

55-
with patch("scribe_data.cli.interactive.config.config", self.config):
56-
with patch("scribe_data.cli.interactive.config.display_summary"):
55+
with patch(
56+
"scribe_data.cli.interactive.config.interactive_mode_config", self.config
57+
):
58+
with patch("scribe_data.cli.interactive.run.display_summary"):
5759
configure_settings()
5860

5961
self.assertEqual(self.config.selected_languages, self.config.languages)
6062
self.assertEqual(self.config.selected_data_types, ["nouns"])
6163
self.assertEqual(self.config.output_type, "json")
6264
self.assertTrue(self.config.configured)
6365

64-
@patch("scribe_data.cli.interactive.config.prompt")
65-
@patch("scribe_data.cli.interactive.config.rprint")
66+
@patch("scribe_data.cli.interactive.run.prompt")
67+
@patch("scribe_data.cli.interactive.run.rprint")
6668
def test_cli_interactive_configure_settings_specific_languages(
6769
self, mock_rprint: MagicMock, mock_prompt: MagicMock
6870
) -> None:
@@ -81,8 +83,10 @@ def test_cli_interactive_configure_settings_specific_languages(
8183
)
8284
mock_prompt.side_effect = lambda *args, **kwargs: next(responses)
8385

84-
with patch("scribe_data.cli.interactive.config.config", self.config):
85-
with patch("scribe_data.cli.interactive.config.display_summary"):
86+
with patch(
87+
"scribe_data.cli.interactive.config.interactive_mode_config", self.config
88+
):
89+
with patch("scribe_data.cli.interactive.run.display_summary"):
8690
configure_settings()
8791

8892
self.assertEqual(self.config.selected_languages, ["english", "spanish"])

‎tests/cli/interactive/test_cli_interactive_execute.py‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ def setUp(self) -> None:
2323
self.config.languages = ["english", "spanish", "french"]
2424
self.config.data_types = ["nouns", "verbs"]
2525

26-
@patch("scribe_data.cli.interactive.get_data")
27-
@patch("scribe_data.cli.interactive.tqdm")
28-
@patch("scribe_data.cli.interactive.logger")
26+
@patch("scribe_data.cli.interactive.execute.get_data")
27+
@patch("scribe_data.cli.interactive.execute.tqdm")
28+
@patch("scribe_data.cli.interactive.execute.logger")
2929
def test_cli_interactive_execute_request(
3030
self, mock_logger: MagicMock, mock_tqdm: MagicMock, mock_get_data: MagicMock
3131
) -> None:
@@ -40,7 +40,9 @@ def test_cli_interactive_execute_request(
4040
mock_progress = MagicMock()
4141
mock_tqdm.return_value.__enter__.return_value = mock_progress
4242

43-
with patch("scribe_data.cli.interactive.config", self.config):
43+
with patch(
44+
"scribe_data.cli.interactive.config.interactive_mode_config", self.config
45+
):
4446
execute_request()
4547

4648
mock_get_data.assert_called_once_with(
@@ -61,6 +63,8 @@ def test_cli_interactive_display_summary(self, mock_print: MagicMock) -> None:
6163
self.config.selected_data_types = ["nouns"]
6264
self.config.output_type = "json"
6365

64-
with patch("scribe_data.cli.interactive.config", self.config):
66+
with patch(
67+
"scribe_data.cli.interactive.config.interactive_mode_config", self.config
68+
):
6569
display_summary()
6670
mock_print.assert_called()

‎tests/cli/interactive/test_cli_interactive_prompt.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ def setUp(self) -> None:
2929
self.config.languages = ["english", "spanish", "french"]
3030
self.config.data_types = ["nouns", "verbs"]
3131

32-
@patch("scribe_data.cli.interactive.prompt")
33-
@patch("scribe_data.cli.interactive.rprint")
32+
@patch("scribe_data.cli.interactive.prompt.prompt")
33+
@patch("scribe_data.cli.interactive.prompt.rprint")
3434
def test_cli_interactive_request_total_lexeme(
3535
self, mock_rprint: MagicMock, mock_prompt: MagicMock
3636
) -> None:
@@ -43,9 +43,11 @@ def test_cli_interactive_request_total_lexeme(
4343
"nouns", # first call for data types
4444
]
4545

46-
with patch("scribe_data.cli.interactive.config", self.config):
46+
with patch(
47+
"scribe_data.cli.interactive.config.interactive_mode_config", self.config
48+
):
4749
with patch(
48-
"scribe_data.cli.interactive.list_all_languages",
50+
"scribe_data.cli.interactive.config.list_all_languages",
4951
return_value=["english", "french"],
5052
):
5153
prompt_for_languages()

‎tests/cli/interactive/test_cli_interactive_run.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def setUp(self) -> None:
2222
self.config.data_types = ["nouns", "verbs"]
2323

2424
@patch(
25-
"scribe_data.cli.interactive.resolve_wiktionary_dump_path",
25+
"scribe_data.cli.interactive.run.resolve_wiktionary_dump_path",
2626
return_value=Path("/dump/path"),
2727
)
2828
@patch("scribe_data.wiktionary.parse_translations.parse_wiktionary_translations")

‎tests/cli/list/test_cli_list_wrapper.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def test_cli_list_wrapper_list_all(
2020
mock_list_languages.assert_called_once()
2121
mock_list_data_types.assert_called_once()
2222

23-
@patch("scribe_data.cli.list.list_all")
23+
@patch("scribe_data.cli.list.wrapper.list_all")
2424
def test_cli_list_wrapper_all(self, mock_list_all: MagicMock) -> None:
2525
list_wrapper(all_bool=True)
2626
mock_list_all.assert_called_once()
@@ -58,7 +58,7 @@ def test_cli_list_wrapper_data_types_for_language(
5858
list_wrapper(language="English", data_type=True)
5959
mock_list_data_types.assert_called_with("English")
6060

61-
@patch("scribe_data.cli.list.list_all")
61+
@patch("scribe_data.cli.list.wrapper.list_all")
6262
def test_cli_list_wrapper_list_all_command(self, mock_list_all: MagicMock) -> None:
6363
test_cli_list_wrapper_args = ["main.py", "list", "--all"]
6464
with patch("sys.argv", test_cli_list_wrapper_args):

‎tests/cli/total/test_cli_total_query.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,14 +185,14 @@ def setUp(self) -> None:
185185
"verbs": "Q24905",
186186
}
187187

188-
@patch("scribe_data.cli.total.data_type_metadata", new_callable=dict)
188+
@patch("scribe_data.cli.total.query.data_type_metadata", new_callable=dict)
189189
def test_get_qid_by_input_valid(self, mock_data_type_metadata: MagicMock) -> None:
190190
mock_data_type_metadata.update(self.valid_data_types)
191191

192192
for data_type, expected_qid in self.valid_data_types.items():
193193
self.assertEqual(get_qid_by_input(data_type), expected_qid)
194194

195-
@patch("scribe_data.cli.total.data_type_metadata", new_callable=dict)
195+
@patch("scribe_data.cli.total.query.data_type_metadata", new_callable=dict)
196196
def test_get_qid_by_input_invalid(self, mock_data_type_metadata: MagicMock) -> None:
197197
mock_data_type_metadata.update(self.valid_data_types)
198198

0 commit comments

Comments
 (0)