refactor(handlers): Refactored the handlers to all use the handle_table_events macro when appropriate and created tests for the macro so tests don't have to be duplicated across each handler

This commit is contained in:
2024-12-11 17:03:52 -07:00
parent c09950d0af
commit ed2211586e
44 changed files with 1592 additions and 9288 deletions
@@ -2,11 +2,11 @@ use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::App;
use crate::event::Key;
use crate::handlers::radarr_handlers::handle_change_tab_left_right_keys;
use crate::handlers::table_handler::TableHandlingProps;
use crate::handlers::table_handler::TableHandlingConfig;
use crate::handlers::{handle_clear_errors, handle_prompt_toggle, KeyEventHandler};
use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, ROOT_FOLDERS_BLOCKS};
use crate::models::servarr_models::RootFolder;
use crate::models::{HorizontallyScrollableText, Scrollable};
use crate::models::HorizontallyScrollableText;
use crate::network::radarr_network::RadarrEvent;
use crate::{handle_table_events, handle_text_box_keys, handle_text_box_left_right_keys};
@@ -32,10 +32,10 @@ impl<'a, 'b> RootFoldersHandler<'a, 'b> {
impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for RootFoldersHandler<'a, 'b> {
fn handle(&mut self) {
let root_folder_table_handling_props =
TableHandlingProps::new(ActiveRadarrBlock::RootFolders.into());
let root_folder_table_handling_config =
TableHandlingConfig::new(ActiveRadarrBlock::RootFolders.into());
if !self.handle_root_folders_table_events(root_folder_table_handling_props) {
if !self.handle_root_folders_table_events(root_folder_table_handling_config) {
self.handle_key_event();
}
}
@@ -1,6 +1,5 @@
#[cfg(test)]
mod tests {
use pretty_assertions::assert_str_eq;
use strum::IntoEnumIterator;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
@@ -12,110 +11,12 @@ mod tests {
use crate::models::servarr_models::RootFolder;
use crate::models::HorizontallyScrollableText;
mod test_handle_scroll_up_and_down {
use rstest::rstest;
use crate::models::servarr_models::RootFolder;
use crate::{simple_stateful_iterable_vec, test_iterable_scroll};
use super::*;
test_iterable_scroll!(
test_root_folders_scroll,
RootFoldersHandler,
radarr_data,
root_folders,
simple_stateful_iterable_vec!(RootFolder, String, path),
ActiveRadarrBlock::RootFolders,
None,
path
);
#[rstest]
fn test_root_folders_scroll_no_op_when_not_ready(
#[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
) {
let mut app = App::default();
app.is_loading = true;
app
.data
.radarr_data
.root_folders
.set_items(simple_stateful_iterable_vec!(RootFolder, String, path));
RootFoldersHandler::with(key, &mut app, ActiveRadarrBlock::RootFolders, None).handle();
assert_str_eq!(
app.data.radarr_data.root_folders.current_selection().path,
"Test 1"
);
RootFoldersHandler::with(key, &mut app, ActiveRadarrBlock::RootFolders, None).handle();
assert_str_eq!(
app.data.radarr_data.root_folders.current_selection().path,
"Test 1"
);
}
}
mod test_handle_home_end {
use pretty_assertions::assert_eq;
use std::sync::atomic::Ordering;
use pretty_assertions::assert_eq;
use crate::models::servarr_models::RootFolder;
use crate::{extended_stateful_iterable_vec, test_iterable_home_and_end};
use super::*;
test_iterable_home_and_end!(
test_root_folders_home_end,
RootFoldersHandler,
radarr_data,
root_folders,
extended_stateful_iterable_vec!(RootFolder, String, path),
ActiveRadarrBlock::RootFolders,
None,
path
);
#[test]
fn test_root_folders_home_end_no_op_when_not_ready() {
let mut app = App::default();
app.is_loading = true;
app
.data
.radarr_data
.root_folders
.set_items(extended_stateful_iterable_vec!(RootFolder, String, path));
RootFoldersHandler::with(
DEFAULT_KEYBINDINGS.end.key,
&mut app,
ActiveRadarrBlock::RootFolders,
None,
)
.handle();
assert_str_eq!(
app.data.radarr_data.root_folders.current_selection().path,
"Test 1"
);
RootFoldersHandler::with(
DEFAULT_KEYBINDINGS.home.key,
&mut app,
ActiveRadarrBlock::RootFolders,
None,
)
.handle();
assert_str_eq!(
app.data.radarr_data.root_folders.current_selection().path,
"Test 1"
);
}
use crate::models::servarr_models::RootFolder;
#[test]
fn test_add_root_folder_prompt_home_end_keys() {