test: Updated Rust edition to 2024 and refactored network module tests to be more idiomatic

src/network/sonarr_network/blocklist/mod.rs

@@ -1,11 +1,11 @@
+use crate::models::Route;
 use crate::models::servarr_data::sonarr::sonarr_data::ActiveSonarrBlock;
 use crate::models::sonarr_models::{BlocklistItem, BlocklistResponse};
-use crate::models::Route;
 use crate::network::sonarr_network::SonarrEvent;
 use crate::network::{Network, RequestMethod};
 use anyhow::Result;
 use log::info;
-use serde_json::{json, Value};
+use serde_json::{Value, json};
 
 #[cfg(test)]
 #[path = "sonarr_blocklist_network_tests.rs"]

src/network/sonarr_network/blocklist/sonarr_blocklist_network_tests.rs

@@ -3,17 +3,14 @@ mod tests {
   use crate::models::servarr_data::sonarr::sonarr_data::ActiveSonarrBlock;
   use crate::models::sonarr_models::{BlocklistItem, BlocklistResponse, Series, SonarrSerdeable};
   use crate::models::stateful_table::SortOption;
-  use crate::network::network_tests::test_utils::mock_servarr_api;
+  use crate::network::network_tests::test_utils::{MockServarrApi, test_network};
+  use crate::network::sonarr_network::SonarrEvent;
   use crate::network::sonarr_network::sonarr_network_test_utils::test_utils::{
     blocklist_item, series,
   };
-  use crate::network::sonarr_network::SonarrEvent;
-  use crate::network::{Network, RequestMethod};
   use pretty_assertions::assert_eq;
-  use reqwest::Client;
   use rstest::rstest;
-  use serde_json::{json, Number};
-  use tokio_util::sync::CancellationToken;
+  use serde_json::{Number, json};
 
   #[tokio::test]
   async fn test_handle_clear_sonarr_blocklist_event() {
@@ -32,62 +29,54 @@ mod tests {
       },
     ];
     let expected_request_json = json!({ "ids": [1, 2, 3]});
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Delete,
-      Some(expected_request_json),
-      None,
-      None,
-      SonarrEvent::ClearBlocklist,
-      None,
-      None,
-    )
-    .await;
-    app_arc
+    let (mock, app, _server) = MockServarrApi::delete()
+      .with_request_body(expected_request_json)
+      .build_for(SonarrEvent::ClearBlocklist)
+      .await;
+    app
       .lock()
       .await
       .data
       .sonarr_data
       .blocklist
       .set_items(blocklist_items);
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+    app.lock().await.server_tabs.next();
+    let mut network = test_network(&app);
 
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::ClearBlocklist)
-      .await
-      .is_ok());
+    assert!(
+      network
+        .handle_sonarr_event(SonarrEvent::ClearBlocklist)
+        .await
+        .is_ok()
+    );
 
-    async_server.assert_async().await;
+    mock.assert_async().await;
   }
 
   #[tokio::test]
   async fn test_handle_delete_sonarr_blocklist_item_event() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Delete,
-      None,
-      None,
-      None,
-      SonarrEvent::DeleteBlocklistItem(1),
-      Some("/1"),
-      None,
-    )
-    .await;
-    app_arc
+    let (mock, app, _server) = MockServarrApi::delete()
+      .path("/1")
+      .build_for(SonarrEvent::DeleteBlocklistItem(1))
+      .await;
+    app
       .lock()
       .await
       .data
       .sonarr_data
       .blocklist
       .set_items(vec![blocklist_item()]);
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+    app.lock().await.server_tabs.next();
+    let mut network = test_network(&app);
 
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::DeleteBlocklistItem(1))
-      .await
-      .is_ok());
+    assert!(
+      network
+        .handle_sonarr_event(SonarrEvent::DeleteBlocklistItem(1))
+        .await
+        .is_ok()
+    );
 
-    async_server.assert_async().await;
+    mock.assert_async().await;
   }
 
   #[rstest]
@@ -135,17 +124,11 @@ mod tests {
         ..blocklist_item()
       },
     ];
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(blocklist_json),
-      None,
-      SonarrEvent::GetBlocklist,
-      None,
-      None,
-    )
-    .await;
-    app_arc
+    let (mock, app, _server) = MockServarrApi::get()
+      .returns(blocklist_json)
+      .build_for(SonarrEvent::GetBlocklist)
+      .await;
+    app
       .lock()
       .await
       .data
@@ -156,7 +139,7 @@ mod tests {
         title: "Z Series".into(),
         ..series()
       }]);
-    app_arc.lock().await.data.sonarr_data.blocklist.sort_asc = true;
+    app.lock().await.data.sonarr_data.blocklist.sort_asc = true;
     if use_custom_sorting {
       let cmp_fn = |a: &BlocklistItem, b: &BlocklistItem| {
         a.source_title
@@ -169,7 +152,7 @@ mod tests {
         name: "Source Title",
         cmp_fn: Some(cmp_fn),
       };
-      app_arc
+      app
         .lock()
         .await
         .data
@@ -177,20 +160,20 @@ mod tests {
         .blocklist
         .sorting(vec![blocklist_sort_option]);
     }
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+    app.lock().await.server_tabs.next();
+    let mut network = test_network(&app);
 
     if let SonarrSerdeable::BlocklistResponse(blocklist) = network
       .handle_sonarr_event(SonarrEvent::GetBlocklist)
       .await
       .unwrap()
     {
-      async_server.assert_async().await;
+      mock.assert_async().await;
       assert_eq!(
-        app_arc.lock().await.data.sonarr_data.blocklist.items,
+        app.lock().await.data.sonarr_data.blocklist.items,
         expected_blocklist
       );
-      assert!(app_arc.lock().await.data.sonarr_data.blocklist.sort_asc);
+      assert!(app.lock().await.data.sonarr_data.blocklist.sort_asc);
       assert_eq!(blocklist, response);
     }
   }
@@ -222,18 +205,12 @@ mod tests {
         "id": 456
     }]});
     let response: BlocklistResponse = serde_json::from_value(blocklist_json.clone()).unwrap();
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(blocklist_json),
-      None,
-      SonarrEvent::GetBlocklist,
-      None,
-      None,
-    )
-    .await;
-    app_arc.lock().await.data.sonarr_data.blocklist.sort_asc = true;
-    app_arc
+    let (mock, app, _server) = MockServarrApi::get()
+      .returns(blocklist_json)
+      .build_for(SonarrEvent::GetBlocklist)
+      .await;
+    app.lock().await.data.sonarr_data.blocklist.sort_asc = true;
+    app
       .lock()
       .await
       .push_navigation_stack(ActiveSonarrBlock::BlocklistSortPrompt.into());
@@ -246,24 +223,24 @@ mod tests {
       name: "Source Title",
       cmp_fn: Some(cmp_fn),
     };
-    app_arc
+    app
       .lock()
       .await
       .data
       .sonarr_data
       .blocklist
       .sorting(vec![blocklist_sort_option]);
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+    app.lock().await.server_tabs.next();
+    let mut network = test_network(&app);
 
     if let SonarrSerdeable::BlocklistResponse(blocklist) = network
       .handle_sonarr_event(SonarrEvent::GetBlocklist)
       .await
       .unwrap()
     {
-      async_server.assert_async().await;
-      assert!(app_arc.lock().await.data.sonarr_data.blocklist.is_empty());
-      assert!(app_arc.lock().await.data.sonarr_data.blocklist.sort_asc);
+      mock.assert_async().await;
+      assert!(app.lock().await.data.sonarr_data.blocklist.is_empty());
+      assert!(app.lock().await.data.sonarr_data.blocklist.sort_asc);
       assert_eq!(blocklist, response);
     }
   }