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

src/models/servarr_data/radarr/radarr_test_utils.rs

@@ -4,10 +4,32 @@ pub mod utils {
     AddMovieSearchResult, Collection, CollectionMovie, Credit, Movie, MovieHistoryItem, Release,
     ReleaseField,
   };
+  use crate::models::servarr_data::radarr::modals::MovieDetailsModal;
   use crate::models::servarr_data::radarr::radarr_data::RadarrData;
   use crate::models::{HorizontallyScrollableText, ScrollableText};
 
   pub fn create_test_radarr_data<'a>() -> RadarrData<'a> {
+    let mut movie_details_modal = MovieDetailsModal {
+      movie_details: ScrollableText::with_string("test movie details".to_owned()),
+      ..MovieDetailsModal::default()
+    };
+    movie_details_modal
+      .movie_history
+      .set_items(vec![MovieHistoryItem::default()]);
+    movie_details_modal
+      .movie_cast
+      .set_items(vec![Credit::default()]);
+    movie_details_modal
+      .movie_crew
+      .set_items(vec![Credit::default()]);
+    movie_details_modal
+      .movie_releases
+      .set_items(vec![Release::default()]);
+    movie_details_modal
+      .movie_releases_sort
+      .set_items(vec![ReleaseField::default()]);
+    movie_details_modal.sort_ascending = Some(true);
+
     let mut radarr_data = RadarrData {
       is_searching: true,
       is_filtering: true,
@@ -16,25 +38,10 @@ pub mod utils {
       search: Some("test search".into()),
       filter: Some("test filter".into()),
       edit_root_folder: Some("test path".into()),
-      file_details: "test file details".to_owned(),
-      audio_details: "test audio details".to_owned(),
-      video_details: "test video details".to_owned(),
-      movie_details: ScrollableText::with_string("test movie details".to_owned()),
+      movie_details_modal: Some(movie_details_modal),
       ..RadarrData::default()
     };
-    radarr_data
-      .movie_history
-      .set_items(vec![MovieHistoryItem::default()]);
-    radarr_data.movie_cast.set_items(vec![Credit::default()]);
-    radarr_data.movie_crew.set_items(vec![Credit::default()]);
-    radarr_data
-      .movie_releases
-      .set_items(vec![Release::default()]);
     radarr_data.movie_info_tabs.index = 1;
-    radarr_data
-      .movie_releases_sort
-      .set_items(vec![ReleaseField::default()]);
-    radarr_data.sort_ascending = Some(true);
     radarr_data
       .filtered_movies
       .set_items(vec![Movie::default()]);
@@ -79,16 +86,7 @@ pub mod utils {
   #[macro_export]
   macro_rules! assert_movie_info_tabs_reset {
     ($radarr_data:expr) => {
-      assert!($radarr_data.file_details.is_empty());
-      assert!($radarr_data.audio_details.is_empty());
-      assert!($radarr_data.video_details.is_empty());
-      assert!($radarr_data.movie_details.get_text().is_empty());
-      assert!($radarr_data.movie_history.items.is_empty());
-      assert!($radarr_data.movie_cast.items.is_empty());
-      assert!($radarr_data.movie_crew.items.is_empty());
-      assert!($radarr_data.movie_releases.items.is_empty());
-      assert!($radarr_data.movie_releases_sort.items.is_empty());
-      assert!($radarr_data.sort_ascending.is_none());
+      assert!($radarr_data.movie_details_modal.is_none());
       assert_eq!($radarr_data.movie_info_tabs.index, 0);
     };
   }