Dark-Alex-17/managarr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactored the movie_details_popup data into the MovieDetailsModal so things are neater and to follow the same format I've already established for other modals

Browse Source
This commit is contained in:
Dark-Alex-17
2023-08-11 16:37:21 -06:00
parent f7cb832095
commit ec9d23ede7
14 changed files with 1207 additions and 529 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/handlers/handler_test_utils.rs
-38
View File
@@ -202,25 +202,6 @@ mod test_utils {
};
}
#[macro_export]
macro_rules! test_scrollable_text_scroll {
($func:ident, $handler:ident, $data_ref:ident, $block:expr) => {
#[test]
fn $func() {
let mut app = App::default();
app.data.radarr_data.$data_ref = ScrollableText::with_string("Test 1\nTest 2".to_owned());
$handler::with(&DEFAULT_KEYBINDINGS.up.key, &mut app, &$block, &None).handle();
assert_eq!(app.data.radarr_data.$data_ref.offset, 0);
$handler::with(&DEFAULT_KEYBINDINGS.down.key, &mut app, &$block, &None).handle();
assert_eq!(app.data.radarr_data.$data_ref.offset, 1);
}
};
}
#[macro_export]
macro_rules! test_iterable_home_and_end {
($func:ident, $handler:ident, $data_ref:ident, $block:expr, $context:expr) => {
@@ -326,25 +307,6 @@ mod test_utils {
};
}
#[macro_export]
macro_rules! test_scrollable_text_home_and_end {
($func:ident, $handler:ident, $data_ref:ident, $block:expr) => {
#[test]
fn $func() {
let mut app = App::default();
app.data.radarr_data.$data_ref = ScrollableText::with_string("Test 1\nTest 2".to_owned());
$handler::with(&DEFAULT_KEYBINDINGS.end.key, &mut app, &$block, &None).handle();
assert_eq!(app.data.radarr_data.$data_ref.offset, 1);
$handler::with(&DEFAULT_KEYBINDINGS.home.key, &mut app, &$block, &None).handle();
assert_eq!(app.data.radarr_data.$data_ref.offset, 0);
}
};
}
#[macro_export]
macro_rules! test_handler_delegation {
($handler:ident, $base:expr, $active_block:expr) => {
src/handlers/radarr_handlers/library/movie_details_handler.rs
+220 -41
View File
@@ -50,43 +50,178 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for MovieDetailsHandler<
fn handle_scroll_up(&mut self) {
match self.active_radarr_block {
ActiveRadarrBlock::MovieDetails => self.app.data.radarr_data.movie_details.scroll_up(),
ActiveRadarrBlock::MovieHistory => self.app.data.radarr_data.movie_history.scroll_up(),
ActiveRadarrBlock::Cast => self.app.data.radarr_data.movie_cast.scroll_up(),
ActiveRadarrBlock::Crew => self.app.data.radarr_data.movie_crew.scroll_up(),
ActiveRadarrBlock::ManualSearch => self.app.data.radarr_data.movie_releases.scroll_up(),
ActiveRadarrBlock::ManualSearchSortPrompt => {
self.app.data.radarr_data.movie_releases_sort.scroll_up()
}
ActiveRadarrBlock::MovieDetails => self
.app
.data
.radarr_data
.movie_details_modal
.as_mut()
.unwrap()
.movie_details
.scroll_up(),
ActiveRadarrBlock::MovieHistory => self
.app
.data
.radarr_data
.movie_details_modal
.as_mut()
.unwrap()
.movie_history
.scroll_up(),
ActiveRadarrBlock::Cast => self
.app
.data
.radarr_data
.movie_details_modal
.as_mut()
.unwrap()
.movie_cast
.scroll_up(),
ActiveRadarrBlock::Crew => self
.app
.data
.radarr_data
.movie_details_modal
.as_mut()
.unwrap()
.movie_crew
.scroll_up(),
ActiveRadarrBlock::ManualSearch => self
.app
.data
.radarr_data
.movie_details_modal
.as_mut()
.unwrap()
.movie_releases
.scroll_up(),
ActiveRadarrBlock::ManualSearchSortPrompt => self
.app
.data
.radarr_data
.movie_details_modal
.as_mut()
.unwrap()
.movie_releases_sort
.scroll_up(),
_ => (),
}
}
fn handle_scroll_down(&mut self) {
match self.active_radarr_block {
ActiveRadarrBlock::MovieDetails => self.app.data.radarr_data.movie_details.scroll_down(),
ActiveRadarrBlock::MovieHistory => self.app.data.radarr_data.movie_history.scroll_down(),
ActiveRadarrBlock::Cast => self.app.data.radarr_data.movie_cast.scroll_down(),
ActiveRadarrBlock::Crew => self.app.data.radarr_data.movie_crew.scroll_down(),
ActiveRadarrBlock::ManualSearch => self.app.data.radarr_data.movie_releases.scroll_down(),
ActiveRadarrBlock::ManualSearchSortPrompt => {
self.app.data.radarr_data.movie_releases_sort.scroll_down()
}
ActiveRadarrBlock::MovieDetails => self
.app
.data
.radarr_data
.movie_details_modal
.as_mut()
.unwrap()
.movie_details
.scroll_down(),
ActiveRadarrBlock::MovieHistory => self
.app
.data
.radarr_data
.movie_details_modal
.as_mut()
.unwrap()
.movie_history
.scroll_down(),
ActiveRadarrBlock::Cast => self
.app
.data
.radarr_data
.movie_details_modal
.as_mut()
.unwrap()
.movie_cast
.scroll_down(),
ActiveRadarrBlock::Crew => self
.app
.data
.radarr_data
.movie_details_modal
.as_mut()
.unwrap()
.movie_crew
.scroll_down(),
ActiveRadarrBlock::ManualSearch => self
.app
.data
.radarr_data
.movie_details_modal
.as_mut()
.unwrap()
.movie_releases
.scroll_down(),
ActiveRadarrBlock::ManualSearchSortPrompt => self
.app
.data
.radarr_data
.movie_details_modal
.as_mut()
.unwrap()
.movie_releases_sort
.scroll_down(),
_ => (),
}
}
fn handle_home(&mut self) {
match self.active_radarr_block {
ActiveRadarrBlock::MovieDetails => self.app.data.radarr_data.movie_details.scroll_to_top(),
ActiveRadarrBlock::MovieHistory => self.app.data.radarr_data.movie_history.scroll_to_top(),
ActiveRadarrBlock::Cast => self.app.data.radarr_data.movie_cast.scroll_to_top(),
ActiveRadarrBlock::Crew => self.app.data.radarr_data.movie_crew.scroll_to_top(),
ActiveRadarrBlock::ManualSearch => self.app.data.radarr_data.movie_releases.scroll_to_top(),
ActiveRadarrBlock::MovieDetails => self
.app
.data
.radarr_data
.movie_details_modal
.as_mut()
.unwrap()
.movie_details
.scroll_to_top(),
ActiveRadarrBlock::MovieHistory => self
.app
.data
.radarr_data
.movie_details_modal
.as_mut()
.unwrap()
.movie_history
.scroll_to_top(),
ActiveRadarrBlock::Cast => self
.app
.data
.radarr_data
.movie_details_modal
.as_mut()
.unwrap()
.movie_cast
.scroll_to_top(),
ActiveRadarrBlock::Crew => self
.app
.data
.radarr_data
.movie_details_modal
.as_mut()
.unwrap()
.movie_crew
.scroll_to_top(),
ActiveRadarrBlock::ManualSearch => self
.app
.data
.radarr_data
.movie_details_modal
.as_mut()
.unwrap()
.movie_releases
.scroll_to_top(),
ActiveRadarrBlock::ManualSearchSortPrompt => self
.app
.data
.radarr_data
.movie_details_modal
.as_mut()
.unwrap()
.movie_releases_sort
.scroll_to_top(),
_ => (),
@@ -95,17 +230,58 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for MovieDetailsHandler<
fn handle_end(&mut self) {
match self.active_radarr_block {
ActiveRadarrBlock::MovieDetails => self.app.data.radarr_data.movie_details.scroll_to_bottom(),
ActiveRadarrBlock::MovieHistory => self.app.data.radarr_data.movie_history.scroll_to_bottom(),
ActiveRadarrBlock::Cast => self.app.data.radarr_data.movie_cast.scroll_to_bottom(),
ActiveRadarrBlock::Crew => self.app.data.radarr_data.movie_crew.scroll_to_bottom(),
ActiveRadarrBlock::ManualSearch => {
self.app.data.radarr_data.movie_releases.scroll_to_bottom()
}
ActiveRadarrBlock::MovieDetails => self
.app
.data
.radarr_data
.movie_details_modal
.as_mut()
.unwrap()
.movie_details
.scroll_to_bottom(),
ActiveRadarrBlock::MovieHistory => self
.app
.data
.radarr_data
.movie_details_modal
.as_mut()
.unwrap()
.movie_history
.scroll_to_bottom(),
ActiveRadarrBlock::Cast => self
.app
.data
.radarr_data
.movie_details_modal
.as_mut()
.unwrap()
.movie_cast
.scroll_to_bottom(),
ActiveRadarrBlock::Crew => self
.app
.data
.radarr_data
.movie_details_modal
.as_mut()
.unwrap()
.movie_crew
.scroll_to_bottom(),
ActiveRadarrBlock::ManualSearch => self
.app
.data
.radarr_data
.movie_details_modal
.as_mut()
.unwrap()
.movie_releases
.scroll_to_bottom(),
ActiveRadarrBlock::ManualSearchSortPrompt => self
.app
.data
.radarr_data
.movie_details_modal
.as_mut()
.unwrap()
.movie_releases_sort
.scroll_to_bottom(),
_ => (),
@@ -173,20 +349,19 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for MovieDetailsHandler<
self.app.pop_navigation_stack();
}
ActiveRadarrBlock::ManualSearchSortPrompt => {
let movie_releases = self.app.data.radarr_data.movie_releases.items.clone();
let field = self
let movie_details_modal = self
.app
.data
.radarr_data
.movie_releases_sort
.current_selection();
let sort_ascending = !self.app.data.radarr_data.sort_ascending.unwrap();
self.app.data.radarr_data.sort_ascending = Some(sort_ascending);
.movie_details_modal
.as_mut()
.unwrap();
let movie_releases = movie_details_modal.movie_releases.items.clone();
let field = movie_details_modal.movie_releases_sort.current_selection();
let sort_ascending = !movie_details_modal.sort_ascending.unwrap();
movie_details_modal.sort_ascending = Some(sort_ascending);
self
.app
.data
.radarr_data
movie_details_modal
.movie_releases
.set_items(sort_releases_by_selected_field(
movie_releases,
@@ -258,14 +433,18 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for MovieDetailsHandler<
.pop_and_push_navigation_stack((*self.active_radarr_block).into());
}
_ if *key == DEFAULT_KEYBINDINGS.sort.key => {
self
let movie_details_modal = self
.app
.data
.radarr_data
.movie_details_modal
.as_mut()
.unwrap();
movie_details_modal
.movie_releases_sort
.set_items(Vec::from_iter(ReleaseField::iter()));
let sort_ascending = self.app.data.radarr_data.sort_ascending;
self.app.data.radarr_data.sort_ascending =
let sort_ascending = movie_details_modal.sort_ascending;
movie_details_modal.sort_ascending =
Some(sort_ascending.is_some() && sort_ascending.unwrap());
self
.app
src/handlers/radarr_handlers/library/movie_details_handler_tests.rs
+579 -117
View File
@@ -24,60 +24,238 @@ mod tests {
use strum::IntoEnumIterator;
use crate::models::radarr_models::ReleaseField;
use crate::{simple_stateful_iterable_vec, test_iterable_scroll, test_scrollable_text_scroll};
use crate::models::servarr_data::radarr::modals::MovieDetailsModal;
use crate::simple_stateful_iterable_vec;
use super::*;
test_scrollable_text_scroll!(
test_movie_details_scroll,
MovieDetailsHandler,
movie_details,
ActiveRadarrBlock::MovieDetails
);
#[test]
fn test_movie_details_scroll() {
let mut app = App::default();
app.data.radarr_data.movie_details_modal = Some(MovieDetailsModal {
movie_details: ScrollableText::with_string("Test 1\nTest 2".to_owned()),
..MovieDetailsModal::default()
});
test_iterable_scroll!(
test_movie_history_scroll,
MovieDetailsHandler,
movie_history,
simple_stateful_iterable_vec!(MovieHistoryItem, HorizontallyScrollableText, source_title),
ActiveRadarrBlock::MovieHistory,
None,
source_title,
to_string
);
MovieDetailsHandler::with(
&DEFAULT_KEYBINDINGS.up.key,
&mut app,
&ActiveRadarrBlock::MovieDetails,
&None,
)
.handle();
test_iterable_scroll!(
test_cast_scroll,
MovieDetailsHandler,
movie_cast,
simple_stateful_iterable_vec!(Credit, String, person_name),
ActiveRadarrBlock::Cast,
None,
person_name,
to_owned
);
assert_eq!(
app
.data
.radarr_data
.movie_details_modal
.as_ref()
.unwrap()
.movie_details
.offset,
0
);
test_iterable_scroll!(
test_crew_scroll,
MovieDetailsHandler,
movie_crew,
simple_stateful_iterable_vec!(Credit, String, person_name),
ActiveRadarrBlock::Crew,
None,
person_name,
to_owned
);
MovieDetailsHandler::with(
&DEFAULT_KEYBINDINGS.down.key,
&mut app,
&ActiveRadarrBlock::MovieDetails,
&None,
)
.handle();
test_iterable_scroll!(
test_manual_search_scroll,
MovieDetailsHandler,
movie_releases,
simple_stateful_iterable_vec!(Release, HorizontallyScrollableText),
ActiveRadarrBlock::ManualSearch,
None,
title,
to_string
);
assert_eq!(
app
.data
.radarr_data
.movie_details_modal
.as_ref()
.unwrap()
.movie_details
.offset,
1
);
}
#[rstest]
fn test_movie_history_scroll(
#[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
) {
let mut app = App::default();
let mut movie_details_modal = MovieDetailsModal::default();
movie_details_modal
.movie_history
.set_items(simple_stateful_iterable_vec!(
MovieHistoryItem,
HorizontallyScrollableText,
source_title
));
app.data.radarr_data.movie_details_modal = Some(movie_details_modal);
MovieDetailsHandler::with(&key, &mut app, &ActiveRadarrBlock::MovieHistory, &None).handle();
assert_str_eq!(
app
.data
.radarr_data
.movie_details_modal
.as_ref()
.unwrap()
.movie_history
.current_selection()
.source_title
.to_string(),
"Test 2"
);
MovieDetailsHandler::with(&key, &mut app, &ActiveRadarrBlock::MovieHistory, &None).handle();
assert_str_eq!(
app
.data
.radarr_data
.movie_details_modal
.as_ref()
.unwrap()
.movie_history
.current_selection()
.source_title
.to_string(),
"Test 1"
);
}
#[rstest]
fn test_cast_scroll(
#[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
) {
let mut app = App::default();
let mut movie_details_modal = MovieDetailsModal::default();
movie_details_modal
.movie_cast
.set_items(simple_stateful_iterable_vec!(Credit, String, person_name));
app.data.radarr_data.movie_details_modal = Some(movie_details_modal);
MovieDetailsHandler::with(&key, &mut app, &ActiveRadarrBlock::Cast, &None).handle();
assert_str_eq!(
app
.data
.radarr_data
.movie_details_modal
.as_ref()
.unwrap()
.movie_cast
.current_selection()
.person_name,
"Test 2"
);
MovieDetailsHandler::with(&key, &mut app, &ActiveRadarrBlock::Cast, &None).handle();
assert_str_eq!(
app
.data
.radarr_data
.movie_details_modal
.as_ref()
.unwrap()
.movie_cast
.current_selection()
.person_name,
"Test 1"
);
}
#[rstest]
fn test_crew_scroll(
#[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
) {
let mut app = App::default();
let mut movie_details_modal = MovieDetailsModal::default();
movie_details_modal
.movie_crew
.set_items(simple_stateful_iterable_vec!(Credit, String, person_name));
app.data.radarr_data.movie_details_modal = Some(movie_details_modal);
MovieDetailsHandler::with(&key, &mut app, &ActiveRadarrBlock::Crew, &None).handle();
assert_str_eq!(
app
.data
.radarr_data
.movie_details_modal
.as_ref()
.unwrap()
.movie_crew
.current_selection()
.person_name,
"Test 2"
);
MovieDetailsHandler::with(&key, &mut app, &ActiveRadarrBlock::Crew, &None).handle();
assert_str_eq!(
app
.data
.radarr_data
.movie_details_modal
.as_ref()
.unwrap()
.movie_crew
.current_selection()
.person_name,
"Test 1"
);
}
#[rstest]
fn test_manual_search_scroll(
#[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
) {
let mut app = App::default();
let mut movie_details_modal = MovieDetailsModal::default();
movie_details_modal
.movie_releases
.set_items(simple_stateful_iterable_vec!(
Release,
HorizontallyScrollableText
));
app.data.radarr_data.movie_details_modal = Some(movie_details_modal);
MovieDetailsHandler::with(&key, &mut app, &ActiveRadarrBlock::ManualSearch, &None).handle();
assert_str_eq!(
app
.data
.radarr_data
.movie_details_modal
.as_ref()
.unwrap()
.movie_releases
.current_selection()
.title
.to_string(),
"Test 2"
);
MovieDetailsHandler::with(&key, &mut app, &ActiveRadarrBlock::ManualSearch, &None).handle();
assert_str_eq!(
app
.data
.radarr_data
.movie_details_modal
.as_ref()
.unwrap()
.movie_releases
.current_selection()
.title
.to_string(),
"Test 1"
);
}
#[rstest]
fn test_manual_search_sort_scroll(
@@ -85,11 +263,11 @@ mod tests {
) {
let release_field_vec = Vec::from_iter(ReleaseField::iter());
let mut app = App::default();
app
.data
.radarr_data
let mut movie_details_modal = MovieDetailsModal::default();
movie_details_modal
.movie_releases_sort
.set_items(release_field_vec.clone());
app.data.radarr_data.movie_details_modal = Some(movie_details_modal);
if key == Key::Up {
for i in (0..release_field_vec.len()).rev() {
@@ -102,7 +280,14 @@ mod tests {
.handle();
assert_eq!(
app.data.radarr_data.movie_releases_sort.current_selection(),
app
.data
.radarr_data
.movie_details_modal
.as_ref()
.unwrap()
.movie_releases_sort
.current_selection(),
&release_field_vec[i]
);
}
@@ -117,7 +302,14 @@ mod tests {
.handle();
assert_eq!(
app.data.radarr_data.movie_releases_sort.current_selection(),
app
.data
.radarr_data
.movie_details_modal
.as_ref()
.unwrap()
.movie_releases_sort
.current_selection(),
&release_field_vec[(i + 1) % release_field_vec.len()]
);
}
@@ -128,73 +320,290 @@ mod tests {
mod test_handle_home_end {
use strum::IntoEnumIterator;
use crate::extended_stateful_iterable_vec;
use crate::models::radarr_models::ReleaseField;
use crate::{
extended_stateful_iterable_vec, test_iterable_home_and_end, test_scrollable_text_home_and_end,
};
use crate::models::servarr_data::radarr::modals::MovieDetailsModal;
use super::*;
test_scrollable_text_home_and_end!(
test_movie_details_home_end,
MovieDetailsHandler,
movie_details,
ActiveRadarrBlock::MovieDetails
);
#[test]
fn test_movie_details_home_end() {
let mut app = App::default();
let movie_details_modal = MovieDetailsModal {
movie_details: ScrollableText::with_string("Test 1\nTest 2".to_owned()),
..MovieDetailsModal::default()
};
app.data.radarr_data.movie_details_modal = Some(movie_details_modal);
test_iterable_home_and_end!(
test_movie_history_home_end,
MovieDetailsHandler,
movie_history,
extended_stateful_iterable_vec!(MovieHistoryItem, HorizontallyScrollableText, source_title),
ActiveRadarrBlock::MovieHistory,
None,
source_title,
to_string
);
MovieDetailsHandler::with(
&DEFAULT_KEYBINDINGS.end.key,
&mut app,
&ActiveRadarrBlock::MovieDetails,
&None,
)
.handle();
test_iterable_home_and_end!(
test_cast_home_end,
MovieDetailsHandler,
movie_cast,
extended_stateful_iterable_vec!(Credit, String, person_name),
ActiveRadarrBlock::Cast,
None,
person_name,
to_owned
);
assert_eq!(
app
.data
.radarr_data
.movie_details_modal
.as_ref()
.unwrap()
.movie_details
.offset,
1
);
test_iterable_home_and_end!(
test_crew_home_end,
MovieDetailsHandler,
movie_crew,
extended_stateful_iterable_vec!(Credit, String, person_name),
ActiveRadarrBlock::Crew,
None,
person_name,
to_owned
);
MovieDetailsHandler::with(
&DEFAULT_KEYBINDINGS.home.key,
&mut app,
&ActiveRadarrBlock::MovieDetails,
&None,
)
.handle();
test_iterable_home_and_end!(
test_manual_search_home_end,
MovieDetailsHandler,
movie_releases,
extended_stateful_iterable_vec!(Release, HorizontallyScrollableText),
ActiveRadarrBlock::ManualSearch,
None,
title,
to_string
);
assert_eq!(
app
.data
.radarr_data
.movie_details_modal
.as_ref()
.unwrap()
.movie_details
.offset,
0
);
}
#[test]
fn test_movie_history_home_end() {
let mut app = App::default();
let mut movie_details_modal = MovieDetailsModal::default();
movie_details_modal
.movie_history
.set_items(extended_stateful_iterable_vec!(
MovieHistoryItem,
HorizontallyScrollableText,
source_title
));
app.data.radarr_data.movie_details_modal = Some(movie_details_modal);
MovieDetailsHandler::with(
&DEFAULT_KEYBINDINGS.end.key,
&mut app,
&ActiveRadarrBlock::MovieHistory,
&None,
)
.handle();
assert_str_eq!(
app
.data
.radarr_data
.movie_details_modal
.as_ref()
.unwrap()
.movie_history
.current_selection()
.source_title
.to_string(),
"Test 3"
);
MovieDetailsHandler::with(
&DEFAULT_KEYBINDINGS.home.key,
&mut app,
&ActiveRadarrBlock::MovieHistory,
&None,
)
.handle();
assert_str_eq!(
app
.data
.radarr_data
.movie_details_modal
.as_ref()
.unwrap()
.movie_history
.current_selection()
.source_title
.to_string(),
"Test 1"
);
}
#[test]
fn test_cast_home_end() {
let mut app = App::default();
let mut movie_details_modal = MovieDetailsModal::default();
movie_details_modal
.movie_cast
.set_items(extended_stateful_iterable_vec!(Credit, String, person_name));
app.data.radarr_data.movie_details_modal = Some(movie_details_modal);
MovieDetailsHandler::with(
&DEFAULT_KEYBINDINGS.end.key,
&mut app,
&ActiveRadarrBlock::Cast,
&None,
)
.handle();
assert_str_eq!(
app
.data
.radarr_data
.movie_details_modal
.as_ref()
.unwrap()
.movie_cast
.current_selection()
.person_name,
"Test 3"
);
MovieDetailsHandler::with(
&DEFAULT_KEYBINDINGS.home.key,
&mut app,
&ActiveRadarrBlock::Cast,
&None,
)
.handle();
assert_str_eq!(
app
.data
.radarr_data
.movie_details_modal
.as_ref()
.unwrap()
.movie_cast
.current_selection()
.person_name,
"Test 1"
);
}
#[test]
fn test_crew_home_end() {
let mut app = App::default();
let mut movie_details_modal = MovieDetailsModal::default();
movie_details_modal
.movie_crew
.set_items(extended_stateful_iterable_vec!(Credit, String, person_name));
app.data.radarr_data.movie_details_modal = Some(movie_details_modal);
MovieDetailsHandler::with(
&DEFAULT_KEYBINDINGS.end.key,
&mut app,
&ActiveRadarrBlock::Crew,
&None,
)
.handle();
assert_str_eq!(
app
.data
.radarr_data
.movie_details_modal
.as_ref()
.unwrap()
.movie_crew
.current_selection()
.person_name,
"Test 3"
);
MovieDetailsHandler::with(
&DEFAULT_KEYBINDINGS.home.key,
&mut app,
&ActiveRadarrBlock::Crew,
&None,
)
.handle();
assert_str_eq!(
app
.data
.radarr_data
.movie_details_modal
.as_ref()
.unwrap()
.movie_crew
.current_selection()
.person_name,
"Test 1"
);
}
#[test]
fn test_manual_search_home_end() {
let mut app = App::default();
let mut movie_details_modal = MovieDetailsModal::default();
movie_details_modal
.movie_releases
.set_items(extended_stateful_iterable_vec!(
Release,
HorizontallyScrollableText
));
app.data.radarr_data.movie_details_modal = Some(movie_details_modal);
MovieDetailsHandler::with(
&DEFAULT_KEYBINDINGS.end.key,
&mut app,
&ActiveRadarrBlock::ManualSearch,
&None,
)
.handle();
assert_str_eq!(
app
.data
.radarr_data
.movie_details_modal
.as_ref()
.unwrap()
.movie_releases
.current_selection()
.title
.to_string(),
"Test 3"
);
MovieDetailsHandler::with(
&DEFAULT_KEYBINDINGS.home.key,
&mut app,
&ActiveRadarrBlock::ManualSearch,
&None,
)
.handle();
assert_str_eq!(
app
.data
.radarr_data
.movie_details_modal
.as_ref()
.unwrap()
.movie_releases
.current_selection()
.title
.to_string(),
"Test 1"
);
}
#[test]
fn test_manual_search_sort_home_end() {
let release_field_vec = Vec::from_iter(ReleaseField::iter());
let mut app = App::default();
app
.data
.radarr_data
let mut movie_details_modal = MovieDetailsModal::default();
movie_details_modal
.movie_releases_sort
.set_items(release_field_vec.clone());
app.data.radarr_data.movie_details_modal = Some(movie_details_modal);
MovieDetailsHandler::with(
&DEFAULT_KEYBINDINGS.end.key,
@@ -205,7 +614,14 @@ mod tests {
.handle();
assert_eq!(
app.data.radarr_data.movie_releases_sort.current_selection(),
app
.data
.radarr_data
.movie_details_modal
.as_ref()
.unwrap()
.movie_releases_sort
.current_selection(),
&release_field_vec[release_field_vec.len() - 1]
);
@@ -218,7 +634,14 @@ mod tests {
.handle();
assert_eq!(
app.data.radarr_data.movie_releases_sort.current_selection(),
app
.data
.radarr_data
.movie_details_modal
.as_ref()
.unwrap()
.movie_releases_sort
.current_selection(),
&release_field_vec[0]
);
}
@@ -298,6 +721,7 @@ mod tests {
use rstest::rstest;
use crate::models::radarr_models::ReleaseField;
use crate::models::servarr_data::radarr::modals::MovieDetailsModal;
use crate::network::radarr_network::RadarrEvent;
use super::*;
@@ -381,15 +805,17 @@ mod tests {
#[test]
fn test_manual_search_sort_prompt_submit() {
let mut app = App::default();
app.push_navigation_stack(ActiveRadarrBlock::ManualSearch.into());
app.push_navigation_stack(ActiveRadarrBlock::ManualSearchSortPrompt.into());
app.data.radarr_data.sort_ascending = Some(true);
app
.data
.radarr_data
let mut movie_details_modal = MovieDetailsModal {
sort_ascending: Some(true),
..MovieDetailsModal::default()
};
movie_details_modal
.movie_releases_sort
.set_items(vec![ReleaseField::default()]);
app.data.radarr_data.movie_releases.set_items(release_vec());
movie_details_modal.movie_releases.set_items(release_vec());
app.data.radarr_data.movie_details_modal = Some(movie_details_modal);
app.push_navigation_stack(ActiveRadarrBlock::ManualSearch.into());
app.push_navigation_stack(ActiveRadarrBlock::ManualSearchSortPrompt.into());
let mut expected_vec = release_vec();
expected_vec.reverse();
@@ -406,7 +832,17 @@ mod tests {
app.get_current_route(),
&ActiveRadarrBlock::ManualSearch.into()
);
assert_eq!(app.data.radarr_data.movie_releases.items, expected_vec);
assert_eq!(
app
.data
.radarr_data
.movie_details_modal
.as_ref()
.unwrap()
.movie_releases
.items,
expected_vec
);
}
}
@@ -473,6 +909,7 @@ mod tests {
use strum::IntoEnumIterator;
use crate::models::radarr_models::{MinimumAvailability, Movie};
use crate::models::servarr_data::radarr::modals::MovieDetailsModal;
use crate::models::servarr_data::radarr::radarr_data::radarr_test_utils::utils::create_test_radarr_data;
use crate::models::servarr_data::radarr::radarr_data::{
RadarrData, EDIT_MOVIE_SELECTION_BLOCKS,
@@ -513,6 +950,7 @@ mod tests {
#[test]
fn test_sort_key() {
let mut app = App::default();
app.data.radarr_data.movie_details_modal = Some(MovieDetailsModal::default());
MovieDetailsHandler::with(
&DEFAULT_KEYBINDINGS.sort.key,
@@ -526,9 +964,33 @@ mod tests {
app.get_current_route(),
&ActiveRadarrBlock::ManualSearchSortPrompt.into()
);
assert!(!app.data.radarr_data.movie_releases_sort.items.is_empty());
assert!(app.data.radarr_data.sort_ascending.is_some());
assert_eq!(app.data.radarr_data.sort_ascending, Some(false));
assert!(!app
.data
.radarr_data
.movie_details_modal
.as_ref()
.unwrap()
.movie_releases_sort
.items
.is_empty());
assert!(app
.data
.radarr_data
.movie_details_modal
.as_ref()
.unwrap()
.sort_ascending
.is_some());
assert_eq!(
app
.data
.radarr_data
.movie_details_modal
.as_ref()
.unwrap()
.sort_ascending,
Some(false)
);
}
#[rstest]
src/handlers/radarr_handlers/system/system_details_handler_tests.rs
+52 -16
View File
@@ -17,7 +17,7 @@ mod tests {
use rstest::rstest;
use crate::models::{HorizontallyScrollableText, ScrollableText};
use crate::{simple_stateful_iterable_vec, test_iterable_scroll, test_scrollable_text_scroll};
use crate::{simple_stateful_iterable_vec, test_iterable_scroll};
use super::*;
@@ -51,19 +51,36 @@ mod tests {
name
);
test_scrollable_text_scroll!(
test_system_updates_scroll,
SystemDetailsHandler,
updates,
ActiveRadarrBlock::SystemUpdates
);
#[test]
fn test_system_updates_scroll() {
let mut app = App::default();
app.data.radarr_data.updates = ScrollableText::with_string("Test 1\nTest 2".to_owned());
SystemDetailsHandler::with(
&DEFAULT_KEYBINDINGS.up.key,
&mut app,
&ActiveRadarrBlock::SystemUpdates,
&None,
)
.handle();
assert_eq!(app.data.radarr_data.updates.offset, 0);
SystemDetailsHandler::with(
&DEFAULT_KEYBINDINGS.down.key,
&mut app,
&ActiveRadarrBlock::SystemUpdates,
&None,
)
.handle();
assert_eq!(app.data.radarr_data.updates.offset, 1);
}
}
mod test_handle_home_end {
use crate::models::{HorizontallyScrollableText, ScrollableText};
use crate::{
extended_stateful_iterable_vec, test_iterable_home_and_end, test_scrollable_text_home_and_end,
};
use crate::{extended_stateful_iterable_vec, test_iterable_home_and_end};
use super::*;
@@ -97,12 +114,31 @@ mod tests {
name
);
test_scrollable_text_home_and_end!(
test_system_updates_home_end,
SystemDetailsHandler,
updates,
ActiveRadarrBlock::SystemUpdates
);
#[test]
fn test_system_updates_home_end() {
let mut app = App::default();
app.data.radarr_data.updates = ScrollableText::with_string("Test 1\nTest 2".to_owned());
SystemDetailsHandler::with(
&DEFAULT_KEYBINDINGS.end.key,
&mut app,
&ActiveRadarrBlock::SystemUpdates,
&None,
)
.handle();
assert_eq!(app.data.radarr_data.updates.offset, 1);
SystemDetailsHandler::with(
&DEFAULT_KEYBINDINGS.home.key,
&mut app,
&ActiveRadarrBlock::SystemUpdates,
&None,
)
.handle();
assert_eq!(app.data.radarr_data.updates.offset, 0);
}
}
mod test_handle_left_right_action {