From 8461f3efed951b9b360c4039b9ae5d4adc60136c Mon Sep 17 00:00:00 2001 From: Loup Federico <16464925+Sh099078@users.noreply.github.com> Date: Thu, 7 Nov 2024 19:33:18 +0100 Subject: [PATCH] editoast: rename all test modules to follow rust idiom While the majority of editoast test modules are called "tests", some are mistakenly called "test". Rename all test modules to "tests" so that they follow rust idiom. Signed-off-by: Loup Federico <16464925+Sh099078@users.noreply.github.com> --- editoast/editoast_derive/src/search.rs | 2 +- editoast/editoast_osrdyne_client/src/lib.rs | 2 +- editoast/editoast_schemas/src/infra/operational_point.rs | 2 +- editoast/editoast_schemas/src/infra/signal.rs | 2 +- editoast/editoast_schemas/src/infra/speed_section.rs | 2 +- editoast/editoast_schemas/src/infra/track_section.rs | 2 +- editoast/editoast_search/src/sqlquery.rs | 2 +- editoast/src/core/mod.rs | 2 +- editoast/src/generated_data/error/mod.rs | 2 +- editoast/src/generated_data/utils.rs | 2 +- editoast/src/infra_cache/object_cache/route_cache.rs | 2 +- editoast/src/models/projects.rs | 2 +- editoast/src/models/stdcm_search_environment.rs | 2 +- editoast/src/models/study.rs | 2 +- editoast/src/views/infra/lines.rs | 2 +- editoast/src/views/projects.rs | 2 +- editoast/src/views/search.rs | 2 +- editoast/src/views/stdcm_search_environment.rs | 4 ++-- editoast/src/views/study.rs | 2 +- editoast/src/views/work_schedules.rs | 2 +- 20 files changed, 21 insertions(+), 21 deletions(-) diff --git a/editoast/editoast_derive/src/search.rs b/editoast/editoast_derive/src/search.rs index bc6aa51d266..bc3d8a89b58 100644 --- a/editoast/editoast_derive/src/search.rs +++ b/editoast/editoast_derive/src/search.rs @@ -362,7 +362,7 @@ pub fn expand_store(input: &DeriveInput) -> Result { } #[cfg(test)] -mod test { +mod tests { use darling::FromDeriveInput; use pretty_assertions::assert_eq; diff --git a/editoast/editoast_osrdyne_client/src/lib.rs b/editoast/editoast_osrdyne_client/src/lib.rs index 9d0bfc65ca9..8af792d861e 100644 --- a/editoast/editoast_osrdyne_client/src/lib.rs +++ b/editoast/editoast_osrdyne_client/src/lib.rs @@ -171,7 +171,7 @@ impl HTTPClient { } #[cfg(test)] -mod test { +mod tests { use super::*; #[tokio::test] diff --git a/editoast/editoast_schemas/src/infra/operational_point.rs b/editoast/editoast_schemas/src/infra/operational_point.rs index 90fe90491c8..b3a0b452614 100644 --- a/editoast/editoast_schemas/src/infra/operational_point.rs +++ b/editoast/editoast_schemas/src/infra/operational_point.rs @@ -108,7 +108,7 @@ impl OperationalPoint { } #[cfg(test)] -mod test { +mod tests { use serde_json::from_str; use super::OperationalPointExtensions; diff --git a/editoast/editoast_schemas/src/infra/signal.rs b/editoast/editoast_schemas/src/infra/signal.rs index d7d689aae57..695e255c1e8 100644 --- a/editoast/editoast_schemas/src/infra/signal.rs +++ b/editoast/editoast_schemas/src/infra/signal.rs @@ -88,7 +88,7 @@ impl OSRDIdentified for Signal { } #[cfg(test)] -mod test { +mod tests { use serde_json::from_str; use super::SignalExtensions; diff --git a/editoast/editoast_schemas/src/infra/speed_section.rs b/editoast/editoast_schemas/src/infra/speed_section.rs index a6a00f259c8..1eaeaa0449c 100644 --- a/editoast/editoast_schemas/src/infra/speed_section.rs +++ b/editoast/editoast_schemas/src/infra/speed_section.rs @@ -99,7 +99,7 @@ impl OSRDIdentified for SpeedSection { } #[cfg(test)] -mod test { +mod tests { use serde_json::from_str; use serde_json::from_value; use serde_json::json; diff --git a/editoast/editoast_schemas/src/infra/track_section.rs b/editoast/editoast_schemas/src/infra/track_section.rs index e47cef10b01..d149d537b22 100644 --- a/editoast/editoast_schemas/src/infra/track_section.rs +++ b/editoast/editoast_schemas/src/infra/track_section.rs @@ -65,7 +65,7 @@ impl TrackSection { } #[cfg(test)] -mod test { +mod tests { use geojson; use serde_json::from_str; diff --git a/editoast/editoast_search/src/sqlquery.rs b/editoast/editoast_search/src/sqlquery.rs index d41c33ce9ee..0d18ee43ed4 100644 --- a/editoast/editoast_search/src/sqlquery.rs +++ b/editoast/editoast_search/src/sqlquery.rs @@ -169,7 +169,7 @@ fn value_to_sql(value: &TypedAst, string_bindings: &mut Vec) -> String { } #[cfg(test)] -mod test { +mod tests { use super::SqlQuery; use crate::context::TypedAst; diff --git a/editoast/src/core/mod.rs b/editoast/src/core/mod.rs index 51523dfb06e..48fce5b6cea 100644 --- a/editoast/src/core/mod.rs +++ b/editoast/src/core/mod.rs @@ -362,7 +362,7 @@ impl From for CoreError { } #[cfg(test)] -mod test { +mod tests { use axum::http::StatusCode; use pretty_assertions::assert_eq; use reqwest::Method; diff --git a/editoast/src/generated_data/error/mod.rs b/editoast/src/generated_data/error/mod.rs index 2bf4e21353a..25d571137a9 100644 --- a/editoast/src/generated_data/error/mod.rs +++ b/editoast/src/generated_data/error/mod.rs @@ -429,7 +429,7 @@ impl GeneratedData for ErrorLayer { } #[cfg(test)] -mod test { +mod tests { use rstest::rstest; use super::buffer_stops; diff --git a/editoast/src/generated_data/utils.rs b/editoast/src/generated_data/utils.rs index e12d6ae96d5..178ecfd0c27 100644 --- a/editoast/src/generated_data/utils.rs +++ b/editoast/src/generated_data/utils.rs @@ -59,7 +59,7 @@ impl<'a> InvolvedObjects<'a> { } #[cfg(test)] -mod test { +mod tests { use std::collections::HashSet; use super::InvolvedObjects; diff --git a/editoast/src/infra_cache/object_cache/route_cache.rs b/editoast/src/infra_cache/object_cache/route_cache.rs index caad03e1bec..04173502146 100644 --- a/editoast/src/infra_cache/object_cache/route_cache.rs +++ b/editoast/src/infra_cache/object_cache/route_cache.rs @@ -15,7 +15,7 @@ impl Cache for Route { } #[cfg(test)] -mod test { +mod tests { use crate::infra_cache::tests::create_small_infra_cache; use crate::infra_cache::Graph; diff --git a/editoast/src/models/projects.rs b/editoast/src/models/projects.rs index 02cd78dcbd8..0963296802d 100644 --- a/editoast/src/models/projects.rs +++ b/editoast/src/models/projects.rs @@ -117,7 +117,7 @@ impl Project { } #[cfg(test)] -pub mod test { +pub mod tests { use pretty_assertions::assert_eq; use rstest::rstest; diff --git a/editoast/src/models/stdcm_search_environment.rs b/editoast/src/models/stdcm_search_environment.rs index dddfdc63216..9f2448aaaa5 100644 --- a/editoast/src/models/stdcm_search_environment.rs +++ b/editoast/src/models/stdcm_search_environment.rs @@ -61,7 +61,7 @@ impl StdcmSearchEnvironmentChangeset { } #[cfg(test)] -pub mod test { +pub mod tests { use chrono::NaiveDate; use pretty_assertions::assert_eq; use rstest::rstest; diff --git a/editoast/src/models/study.rs b/editoast/src/models/study.rs index 6e5a9a1ad3d..5372d2afdf2 100644 --- a/editoast/src/models/study.rs +++ b/editoast/src/models/study.rs @@ -73,7 +73,7 @@ fn dates_in_order(a: Option>, b: Option>) -> } #[cfg(test)] -pub mod test { +pub mod tests { use pretty_assertions::assert_eq; use rstest::rstest; diff --git a/editoast/src/views/infra/lines.rs b/editoast/src/views/infra/lines.rs index 472ed85bd81..ecf9ce840a4 100644 --- a/editoast/src/views/infra/lines.rs +++ b/editoast/src/views/infra/lines.rs @@ -82,7 +82,7 @@ async fn get_line_bbox( } #[cfg(test)] -mod test { +mod tests { use axum::http::StatusCode; use editoast_schemas::infra::TrackSectionSncfExtension; use editoast_schemas::primitives::Identifier; diff --git a/editoast/src/views/projects.rs b/editoast/src/views/projects.rs index 2da7adac013..e1a8680c59c 100644 --- a/editoast/src/views/projects.rs +++ b/editoast/src/views/projects.rs @@ -357,7 +357,7 @@ async fn patch( } #[cfg(test)] -pub mod test { +pub mod tests { use axum::http::StatusCode; use pretty_assertions::assert_eq; diff --git a/editoast/src/views/search.rs b/editoast/src/views/search.rs index a031e31264f..3f1fe6a6c8b 100644 --- a/editoast/src/views/search.rs +++ b/editoast/src/views/search.rs @@ -761,7 +761,7 @@ pub(super) struct SearchResultItemTrainSchedule { pub struct SearchConfigFinder; #[cfg(test)] -pub mod test { +pub mod tests { use axum::http::StatusCode; use pretty_assertions::assert_eq; diff --git a/editoast/src/views/stdcm_search_environment.rs b/editoast/src/views/stdcm_search_environment.rs index f25ced7549b..e5f081081f1 100644 --- a/editoast/src/views/stdcm_search_environment.rs +++ b/editoast/src/views/stdcm_search_environment.rs @@ -155,14 +155,14 @@ async fn retrieve_latest( } #[cfg(test)] -pub mod test { +pub mod tests { use axum::http::StatusCode; use chrono::NaiveDate; use pretty_assertions::assert_eq; use rstest::rstest; use super::*; - use crate::models::stdcm_search_environment::test::stdcm_search_env_fixtures; + use crate::models::stdcm_search_environment::tests::stdcm_search_env_fixtures; use crate::views::test_app::TestAppBuilder; use crate::{Create, Retrieve}; diff --git a/editoast/src/views/study.rs b/editoast/src/views/study.rs index 5f67d309e50..35cdb8a7832 100644 --- a/editoast/src/views/study.rs +++ b/editoast/src/views/study.rs @@ -441,7 +441,7 @@ async fn list( } #[cfg(test)] -pub mod test { +pub mod tests { use axum::http::StatusCode; use pretty_assertions::assert_eq; use rstest::rstest; diff --git a/editoast/src/views/work_schedules.rs b/editoast/src/views/work_schedules.rs index 0e824c01bb3..1aaf0c23820 100644 --- a/editoast/src/views/work_schedules.rs +++ b/editoast/src/views/work_schedules.rs @@ -276,7 +276,7 @@ async fn project_path( } #[cfg(test)] -pub mod test { +pub mod tests { use axum::http::StatusCode; use chrono::NaiveDate; use pretty_assertions::assert_eq;