editoast: refactor rolling stock fixtures

Author: shenriotpro

editoast/src/fixtures.rs

@@ -77,15 +77,19 @@ pub mod tests {
         Data::new(pool)
     }
 
+    pub fn get_fast_rolling_stock(name: &str) -> RollingStockModel {
+        let mut rs: RollingStockModel =
+            serde_json::from_str(include_str!("./tests/example_rolling_stock_1.json"))
+                .expect("Unable to parse");
+        rs.name = Some(name.to_string());
+        rs
+    }
+
     pub async fn named_fast_rolling_stock(
         name: &str,
         db_pool: Data<DbPool>,
     ) -> TestFixture<RollingStockModel> {
-        let mut rs = serde_json::from_str::<RollingStockModel>(include_str!(
-            "./tests/example_rolling_stock_1.json"
-        ))
-        .expect("Unable to parse");
-        rs.name = Some(name.to_string());
+        let rs = get_fast_rolling_stock(name);
         TestFixture::create(rs, db_pool).await
     }
 
@@ -95,15 +99,20 @@ pub mod tests {
         named_fast_rolling_stock("fast_rolling_stock", db_pool).await
     }
 
-    pub async fn named_other_rolling_stock(
-        name: &str,
-        db_pool: Data<DbPool>,
-    ) -> TestFixture<RollingStockModel> {
-        let mut rs = serde_json::from_str::<RollingStockModel>(include_str!(
+    pub fn get_other_rolling_stock(name: &str) -> RollingStockModel {
+        let mut rs: RollingStockModel = serde_json::from_str(include_str!(
             "./tests/example_rolling_stock_2_energy_sources.json"
         ))
         .expect("Unable to parse");
         rs.name = Some(name.to_string());
+        rs
+    }
+
+    pub async fn named_other_rolling_stock(
+        name: &str,
+        db_pool: Data<DbPool>,
+    ) -> TestFixture<RollingStockModel> {
+        let rs = get_other_rolling_stock(name);
         TestFixture::create(rs, db_pool).await
     }
 

editoast/src/models/rolling_stock/mod.rs

@@ -241,7 +241,9 @@ impl From<RollingStockModel> for RollingStock {
 #[cfg(test)]
 pub mod tests {
     use crate::error::InternalError;
-    use crate::fixtures::tests::{db_pool, named_fast_rolling_stock, named_other_rolling_stock};
+    use crate::fixtures::tests::{
+        db_pool, get_other_rolling_stock, named_fast_rolling_stock, named_other_rolling_stock,
+    };
     use crate::models::{Retrieve, Update};
     use crate::views::rolling_stocks::RollingStockError;
     use crate::DbPool;
@@ -251,23 +253,6 @@ pub mod tests {
     use super::RollingStockModel;
     use actix_web::web::Data;
 
-    pub fn get_fast_rolling_stock(name: &str) -> RollingStockModel {
-        let mut rs: RollingStockModel =
-            serde_json::from_str(include_str!("../../tests/example_rolling_stock_1.json"))
-                .expect("Unable to parse");
-        rs.name = Some(name.to_string());
-        rs
-    }
-
-    pub fn get_other_rolling_stock(name: &str) -> RollingStockModel {
-        let mut rs: RollingStockModel = serde_json::from_str(include_str!(
-            "../../tests/example_rolling_stock_2_energy_sources.json"
-        ))
-        .expect("Unable to parse");
-        rs.name = Some(name.to_string());
-        rs
-    }
-
     pub fn get_invalid_effort_curves() -> &'static str {
         include_str!("../../tests/example_rolling_stock_3.json")
     }

editoast/src/views/rolling_stocks/mod.rs

@@ -487,11 +487,10 @@ pub mod tests {
         UsageResponse,
     };
     use crate::fixtures::tests::{
-        db_pool, named_fast_rolling_stock, named_other_rolling_stock, train_schedule_with_scenario,
-    };
-    use crate::models::rolling_stock::tests::{
-        get_fast_rolling_stock, get_invalid_effort_curves, get_other_rolling_stock,
+        db_pool, get_fast_rolling_stock, get_other_rolling_stock, named_fast_rolling_stock,
+        named_other_rolling_stock, train_schedule_with_scenario,
     };
+    use crate::models::rolling_stock::tests::get_invalid_effort_curves;
     use crate::models::{Delete, RollingStockModel};
     use crate::views::tests::create_test_service;
     use crate::{assert_editoast_error_type, assert_status_and_read, DbPool};

editoast/src/views/timetable.rs

@@ -498,11 +498,10 @@ pub mod test {
 
     use crate::{
         assert_status_and_read,
-        fixtures::tests::{db_pool, train_with_simulation_output_fixture_set},
-        models::{
-            rolling_stock::tests::get_other_rolling_stock, train_schedule::TrainScheduleValidation,
-            TimetableWithSchedulesDetails,
+        fixtures::tests::{
+            db_pool, get_other_rolling_stock, train_with_simulation_output_fixture_set,
         },
+        models::{train_schedule::TrainScheduleValidation, TimetableWithSchedulesDetails},
         views::tests::create_test_service,
     };