refactor: Updated all handler tests to use purpose built assertions to improve readability and maintainability

src/handlers/radarr_handlers/collections/collection_details_handler_tests.rs

@@ -4,12 +4,12 @@ mod tests {
   use rstest::rstest;
   use strum::IntoEnumIterator;
 
-  use crate::app::key_binding::DEFAULT_KEYBINDINGS;
   use crate::app::App;
+  use crate::app::key_binding::DEFAULT_KEYBINDINGS;
   use crate::assert_modal_absent;
   use crate::event::Key;
-  use crate::handlers::radarr_handlers::collections::collection_details_handler::CollectionDetailsHandler;
   use crate::handlers::KeyEventHandler;
+  use crate::handlers::radarr_handlers::collections::collection_details_handler::CollectionDetailsHandler;
   use crate::models::radarr_models::CollectionMovie;
   use crate::models::servarr_data::radarr::radarr_data::{
     ActiveRadarrBlock, COLLECTION_DETAILS_BLOCKS,
@@ -17,9 +17,9 @@ mod tests {
 
   mod test_handle_submit {
     use crate::assert_navigation_pushed;
+    use crate::models::BlockSelectionState;
     use crate::models::radarr_models::Movie;
     use crate::models::servarr_data::radarr::radarr_data::ADD_MOVIE_SELECTION_BLOCKS;
-    use crate::models::BlockSelectionState;
     use bimap::BiMap;
     use pretty_assertions::assert_eq;
 
@@ -60,37 +60,43 @@ mod tests {
         )
           .into()
       );
-      assert!(!app
-        .data
-        .radarr_data
-        .add_movie_modal
-        .as_ref()
-        .unwrap()
-        .monitor_list
-        .items
-        .is_empty());
+      assert!(
+        !app
+          .data
+          .radarr_data
+          .add_movie_modal
+          .as_ref()
+          .unwrap()
+          .monitor_list
+          .items
+          .is_empty()
+      );
       assert_eq!(
         app.data.radarr_data.selected_block.get_active_block(),
         ActiveRadarrBlock::AddMovieSelectRootFolder
       );
-      assert!(!app
-        .data
-        .radarr_data
-        .add_movie_modal
-        .as_ref()
-        .unwrap()
-        .minimum_availability_list
-        .items
-        .is_empty());
-      assert!(!app
-        .data
-        .radarr_data
-        .add_movie_modal
-        .as_ref()
-        .unwrap()
-        .quality_profile_list
-        .items
-        .is_empty());
+      assert!(
+        !app
+          .data
+          .radarr_data
+          .add_movie_modal
+          .as_ref()
+          .unwrap()
+          .minimum_availability_list
+          .items
+          .is_empty()
+      );
+      assert!(
+        !app
+          .data
+          .radarr_data
+          .add_movie_modal
+          .as_ref()
+          .unwrap()
+          .quality_profile_list
+          .items
+          .is_empty()
+      );
       assert_str_eq!(
         app
           .data
@@ -184,7 +190,7 @@ mod tests {
       .handle();
 
       assert_navigation_popped!(app, ActiveRadarrBlock::Collections.into());
-      assert!(app.data.radarr_data.collection_movies.items.is_empty());
+      assert_is_empty!(app.data.radarr_data.collection_movies.items);
     }
 
     #[test]
@@ -213,7 +219,7 @@ mod tests {
     use crate::models::radarr_models::{Collection, MinimumAvailability};
     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_COLLECTION_SELECTION_BLOCKS,
+      EDIT_COLLECTION_SELECTION_BLOCKS, RadarrData,
     };
     use crate::test_edit_collection_key;
 

src/handlers/radarr_handlers/collections/collections_handler_tests.rs

@@ -7,18 +7,18 @@ mod tests {
   use rstest::rstest;
   use strum::IntoEnumIterator;
 
-  use crate::app::key_binding::DEFAULT_KEYBINDINGS;
   use crate::app::App;
+  use crate::app::key_binding::DEFAULT_KEYBINDINGS;
   use crate::assert_modal_absent;
   use crate::assert_navigation_pushed;
   use crate::event::Key;
-  use crate::handlers::radarr_handlers::collections::{
-    collections_sorting_options, CollectionsHandler,
-  };
   use crate::handlers::KeyEventHandler;
+  use crate::handlers::radarr_handlers::collections::{
+    CollectionsHandler, collections_sorting_options,
+  };
   use crate::models::radarr_models::{Collection, CollectionMovie};
   use crate::models::servarr_data::radarr::radarr_data::{
-    ActiveRadarrBlock, COLLECTIONS_BLOCKS, COLLECTION_DETAILS_BLOCKS, EDIT_COLLECTION_BLOCKS,
+    ActiveRadarrBlock, COLLECTION_DETAILS_BLOCKS, COLLECTIONS_BLOCKS, EDIT_COLLECTION_BLOCKS,
   };
   use crate::test_handler_delegation;
 
@@ -189,7 +189,7 @@ mod tests {
       .handle();
 
       assert!(!app.data.radarr_data.prompt_confirm);
-      assert_eq!(app.data.radarr_data.prompt_confirm_action, None);
+      assert_none!(app.data.radarr_data.prompt_confirm_action);
       assert_navigation_popped!(app, ActiveRadarrBlock::Collections.into());
     }
   }
@@ -233,7 +233,7 @@ mod tests {
       CollectionsHandler::new(ESC_KEY, &mut app, ActiveRadarrBlock::Collections, None).handle();
 
       assert_navigation_popped!(app, ActiveRadarrBlock::Collections.into());
-      assert!(app.error.text.is_empty());
+      assert_is_empty!(app.error.text);
     }
   }
 
@@ -245,7 +245,7 @@ mod tests {
     use crate::models::radarr_models::MinimumAvailability;
     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_COLLECTION_SELECTION_BLOCKS,
+      EDIT_COLLECTION_SELECTION_BLOCKS, RadarrData,
     };
     use crate::network::radarr_network::RadarrEvent;
     use crate::{assert_navigation_popped, test_edit_collection_key};

src/handlers/radarr_handlers/collections/edit_collection_handler_tests.rs

@@ -5,14 +5,14 @@ mod tests {
   use rstest::rstest;
   use strum::IntoEnumIterator;
 
-  use crate::app::key_binding::DEFAULT_KEYBINDINGS;
   use crate::app::App;
+  use crate::app::key_binding::DEFAULT_KEYBINDINGS;
   use crate::assert_modal_absent;
   use crate::assert_navigation_pushed;
   use crate::event::Key;
+  use crate::handlers::KeyEventHandler;
   use crate::handlers::radarr_handlers::collections::edit_collection_handler::EditCollectionHandler;
   use crate::handlers::radarr_handlers::radarr_handler_test_utils::utils::collection;
-  use crate::handlers::KeyEventHandler;
   use crate::models::radarr_models::{Collection, EditCollectionParams, MinimumAvailability};
   use crate::models::servarr_data::radarr::modals::EditCollectionModal;
   use crate::models::servarr_data::radarr::radarr_data::{
@@ -24,9 +24,9 @@ mod tests {
     use rstest::rstest;
     use strum::IntoEnumIterator;
 
+    use crate::models::BlockSelectionState;
     use crate::models::servarr_data::radarr::modals::EditCollectionModal;
     use crate::models::servarr_data::radarr::radarr_data::EDIT_COLLECTION_SELECTION_BLOCKS;
-    use crate::models::BlockSelectionState;
 
     use super::*;
 
@@ -477,15 +477,17 @@ mod tests {
       .handle();
 
       assert!(!app.ignore_special_keys_for_textbox_input);
-      assert!(!app
-        .data
-        .radarr_data
-        .edit_collection_modal
-        .as_ref()
-        .unwrap()
-        .path
-        .text
-        .is_empty());
+      assert!(
+        !app
+          .data
+          .radarr_data
+          .edit_collection_modal
+          .as_ref()
+          .unwrap()
+          .path
+          .text
+          .is_empty()
+      );
       assert_navigation_popped!(app, ActiveRadarrBlock::EditCollectionPrompt.into());
     }
 
@@ -512,7 +514,7 @@ mod tests {
       .handle();
 
       assert_navigation_popped!(app, ActiveRadarrBlock::Collections.into());
-      assert_eq!(app.data.radarr_data.prompt_confirm_action, None);
+      assert_none!(app.data.radarr_data.prompt_confirm_action);
     }
 
     #[test]
@@ -602,7 +604,7 @@ mod tests {
         app.get_current_route(),
         ActiveRadarrBlock::EditCollectionPrompt.into()
       );
-      assert_eq!(app.data.radarr_data.prompt_confirm_action, None);
+      assert_none!(app.data.radarr_data.prompt_confirm_action);
       assert!(!app.should_refresh);
     }
 
@@ -627,7 +629,7 @@ mod tests {
       .handle();
 
       assert_eq!(app.get_current_route(), current_route);
-      assert_eq!(
+      assert_some_eq_x!(
         app
           .data
           .radarr_data
@@ -635,7 +637,7 @@ mod tests {
           .as_ref()
           .unwrap()
           .monitored,
-        Some(true)
+        true
       );
 
       EditCollectionHandler::new(
@@ -647,7 +649,7 @@ mod tests {
       .handle();
 
       assert_eq!(app.get_current_route(), current_route);
-      assert_eq!(
+      assert_some_eq_x!(
         app
           .data
           .radarr_data
@@ -655,7 +657,7 @@ mod tests {
           .as_ref()
           .unwrap()
           .monitored,
-        Some(false)
+        false
       );
     }
 
@@ -685,7 +687,7 @@ mod tests {
       .handle();
 
       assert_eq!(app.get_current_route(), current_route);
-      assert_eq!(
+      assert_some_eq_x!(
         app
           .data
           .radarr_data
@@ -693,7 +695,7 @@ mod tests {
           .as_ref()
           .unwrap()
           .search_on_add,
-        Some(true)
+        true
       );
 
       EditCollectionHandler::new(
@@ -705,7 +707,7 @@ mod tests {
       .handle();
 
       assert_eq!(app.get_current_route(), current_route);
-      assert_eq!(
+      assert_some_eq_x!(
         app
           .data
           .radarr_data
@@ -713,7 +715,7 @@ mod tests {
           .as_ref()
           .unwrap()
           .search_on_add,
-        Some(false)
+        false
       );
     }
 
@@ -750,7 +752,7 @@ mod tests {
         app,
         (selected_block, Some(ActiveRadarrBlock::Collections)).into()
       );
-      assert_eq!(app.data.radarr_data.prompt_confirm_action, None);
+      assert_none!(app.data.radarr_data.prompt_confirm_action);
 
       if selected_block == ActiveRadarrBlock::EditCollectionRootFolderPathInput {
         assert!(app.ignore_special_keys_for_textbox_input);
@@ -865,10 +867,10 @@ mod tests {
     use crate::{
       assert_navigation_popped,
       models::{
+        BlockSelectionState,
         servarr_data::radarr::{
           modals::EditCollectionModal, radarr_data::EDIT_COLLECTION_SELECTION_BLOCKS,
         },
-        BlockSelectionState,
       },
       network::radarr_network::RadarrEvent,
     };