editoast: remove test fixtures

Author: Wadjetz

editoast/src/fixtures.rs

@@ -4,7 +4,6 @@ extern crate diesel;
 mod client;
 mod core;
 mod error;
-mod fixtures;
 mod generated_data;
 mod infra_cache;
 mod map;
@@ -896,12 +895,12 @@ impl CliError {
 mod tests {
     use super::*;
 
-    use crate::fixtures::tests::get_fast_rolling_stock_schema;
-    use crate::fixtures::tests::get_trainschedule_json_array;
     use crate::modelsv2::fixtures::create_electrical_profile_set;
     use crate::modelsv2::RollingStockModel;
 
     use editoast_models::DbConnectionPoolV2;
+    use modelsv2::fixtures::get_fast_rolling_stock_schema;
+    use modelsv2::fixtures::get_trainschedule_json_array;
     use modelsv2::DeleteStatic;
     use rand::distributions::Alphanumeric;
     use rand::{thread_rng, Rng};

editoast/src/main.rs

@@ -2,16 +2,19 @@ use std::io::Cursor;
 use std::ops::DerefMut;
 
 use chrono::Utc;
+use editoast_models::DbConnection;
+use editoast_models::DbConnectionPool;
+use editoast_models::DbConnectionPoolV2;
 use editoast_schemas::infra::Direction;
 use editoast_schemas::infra::DirectionalTrackRange;
 use editoast_schemas::infra::InfraObject;
 use editoast_schemas::infra::RailJson;
 use editoast_schemas::primitives::OSRDObject;
+use editoast_schemas::rolling_stock::RollingStock;
 use editoast_schemas::train_schedule::TrainScheduleBase;
 use postgis_diesel::types::LineString;
 
 use crate::infra_cache::operation::create::apply_create_operation;
-
 use crate::modelsv2::prelude::*;
 use crate::modelsv2::rolling_stock_livery::RollingStockLiveryModel;
 use crate::modelsv2::timetable::Timetable;
@@ -27,9 +30,6 @@ use crate::modelsv2::Tags;
 use crate::views::rolling_stocks::rolling_stock_form::RollingStockForm;
 use crate::views::v2::train_schedule::TrainScheduleForm;
 use crate::ElectricalProfileSet;
-use editoast_models::DbConnection;
-use editoast_models::DbConnectionPool;
-use editoast_models::DbConnectionPoolV2;
 
 pub fn project_changeset(name: &str) -> Changeset<Project> {
     Project::changeset()
@@ -308,3 +308,15 @@ pub async fn create_work_schedule_group(conn: &mut DbConnection) -> WorkSchedule
         .await
         .expect("Failed to create empty work schedule group")
 }
+
+pub fn get_trainschedule_json_array() -> &'static str {
+    include_str!("../tests/train_schedules/simple_array.json")
+}
+
+pub fn get_fast_rolling_stock_schema(name: &str) -> RollingStock {
+    let mut rolling_stock_form: RollingStock =
+        serde_json::from_str(include_str!("../tests/example_rolling_stock_1.json"))
+            .expect("Unable to parse");
+    rolling_stock_form.name = name.to_string();
+    rolling_stock_form
+}

editoast/src/modelsv2/fixtures.rs

@@ -922,8 +922,6 @@ pub mod tests {
     use rstest::rstest;
 
     use super::*;
-    use crate::fixtures::tests::db_pool;
-    use crate::fixtures::tests::small_infra;
     use crate::generated_data::infra_error::InfraError;
     use crate::generated_data::infra_error::InfraErrorType;
     use crate::modelsv2::fixtures::create_small_infra;
@@ -1032,10 +1030,13 @@ pub mod tests {
     #[rstest]
     async fn apply_edit_transaction_should_work() {
         // Init
-        let pg_db_pool = db_pool();
-        let conn = &mut pg_db_pool.get().await.unwrap();
-        let mut small_infra = small_infra(pg_db_pool.clone()).await;
-        let mut infra_cache = InfraCache::load(conn, &small_infra.model).await.unwrap();
+        let app = TestAppBuilder::default_app();
+        let db_pool = app.db_pool();
+
+        let mut small_infra = create_small_infra(&mut db_pool.get_ok()).await;
+        let mut infra_cache = InfraCache::load(&mut db_pool.get_ok(), &small_infra)
+            .await
+            .unwrap();
 
         // Calling "apply_edit" with a OK operation
         let operations: Vec<Operation> = [
@@ -1053,10 +1054,14 @@ pub mod tests {
             }),
         ]
         .to_vec();
-        let result: Vec<InfraObject> =
-            apply_edit(conn, &mut small_infra.model, &operations, &mut infra_cache)
-                .await
-                .unwrap();
+        let result: Vec<InfraObject> = apply_edit(
+            &mut db_pool.get_ok(),
+            &mut small_infra,
+            &operations,
+            &mut infra_cache,
+        )
+        .await
+        .unwrap();
 
         // Check that the updated track has the new length
         assert_eq!(1234.0, result[0].get_data()["length"]);
@@ -1065,9 +1070,12 @@ pub mod tests {
     #[rstest]
     async fn apply_edit_transaction_should_rollback() {
         // Init
-        let conn = &mut db_pool().get().await.unwrap();
-        let mut small_infra = small_infra(db_pool().clone()).await;
-        let mut infra_cache = InfraCache::load(conn, &small_infra.model).await.unwrap();
+        let app = TestAppBuilder::default_app();
+        let db_pool = app.db_pool();
+        let mut small_infra = create_small_infra(&mut db_pool.get_ok()).await;
+        let mut infra_cache = InfraCache::load(&mut db_pool.get_ok(), &small_infra)
+            .await
+            .unwrap();
 
         // Calling "apply_edit" with a first OK operation and a KO second one
         let operations: Vec<Operation> = [
@@ -1097,15 +1105,24 @@ pub mod tests {
             }),
         ]
         .to_vec();
-        let result = apply_edit(conn, &mut small_infra.model, &operations, &mut infra_cache).await;
+        let result = apply_edit(
+            &mut db_pool.get_ok(),
+            &mut small_infra,
+            &operations,
+            &mut infra_cache,
+        )
+        .await;
 
         // Check that we have an error
         assert!(result.is_err());
 
         // Check that TA0 length is not changed
         let res: Vec<ObjectQueryable> = small_infra
-            .model
-            .get_objects(conn, ObjectType::TrackSection, &vec!["TA0".to_string()])
+            .get_objects(
+                &mut db_pool.get_ok(),
+                ObjectType::TrackSection,
+                &vec!["TA0".to_string()],
+            )
             .await
             .unwrap();
         assert_eq!(2000.0, res[0].railjson.as_object().unwrap()["length"]);

editoast/src/views/infra/edition.rs

@@ -754,14 +754,14 @@ pub async fn fetch_all_infra_states(
 
 #[cfg(test)]
 pub mod tests {
-    use std::ops::DerefMut;
     use axum::http::StatusCode;
     use diesel::sql_query;
     use diesel::sql_types::BigInt;
     use diesel_async::RunQueryDsl;
     use pretty_assertions::assert_eq;
     use rstest::rstest;
     use serde_json::json;
+    use std::ops::DerefMut;
     use strum::IntoEnumIterator;
 
     use super::*;