Merge #1200: Remove duplicate code for application initialization in tests

df6ed93 refactor: [#1198] remove duplicate code in app init in tests (Jose Celano)

Pull request description:

  Remove duplicate code for application initialization in tests.

ACKs for top commit:
  josecelano:
    ACK df6ed93

Tree-SHA512: 51cdb91da53e9bb22aeb2724494b111e79f1c3e9db7bbd13dc0558e5bffd677a61faac771ae365f3cebcd689658f8df3821e2a95430a2c2b01d3471f1094bf8b

Author: josecelano

src/bootstrap/jobs/http_tracker.rs

@@ -108,15 +108,8 @@ mod tests {
 
     use torrust_tracker_test_helpers::configuration::ephemeral_public;
 
-    use crate::bootstrap::app::initialize_global_services;
+    use crate::bootstrap::app::{initialize_app_container, initialize_global_services};
     use crate::bootstrap::jobs::http_tracker::start_job;
-    use crate::core::authentication::handler::KeysHandler;
-    use crate::core::authentication::key::repository::in_memory::InMemoryKeyRepository;
-    use crate::core::authentication::key::repository::persisted::DatabaseKeyRepository;
-    use crate::core::authentication::service;
-    use crate::core::services::{initialize_database, initialize_tracker, statistics};
-    use crate::core::whitelist;
-    use crate::core::whitelist::repository::in_memory::InMemoryWhitelist;
     use crate::servers::http::Version;
     use crate::servers::registar::Registar;
 
@@ -126,35 +119,18 @@ mod tests {
         let http_tracker = cfg.http_trackers.clone().expect("missing HTTP tracker configuration");
         let config = &http_tracker[0];
 
-        let (stats_event_sender, _stats_repository) = statistics::setup::factory(cfg.core.tracker_usage_statistics);
-        let stats_event_sender = Arc::new(stats_event_sender);
-
         initialize_global_services(&cfg);
 
-        let database = initialize_database(&cfg);
-        let in_memory_whitelist = Arc::new(InMemoryWhitelist::default());
-        let whitelist_authorization = Arc::new(whitelist::authorization::Authorization::new(
-            &cfg.core,
-            &in_memory_whitelist.clone(),
-        ));
-        let db_key_repository = Arc::new(DatabaseKeyRepository::new(&database));
-        let in_memory_key_repository = Arc::new(InMemoryKeyRepository::default());
-        let authentication_service = Arc::new(service::AuthenticationService::new(&cfg.core, &in_memory_key_repository));
-        let _keys_handler = Arc::new(KeysHandler::new(
-            &db_key_repository.clone(),
-            &in_memory_key_repository.clone(),
-        ));
-
-        let tracker = Arc::new(initialize_tracker(&cfg, &database, &whitelist_authorization));
+        let app_container = initialize_app_container(&cfg);
 
         let version = Version::V1;
 
         start_job(
             config,
-            tracker,
-            authentication_service,
-            whitelist_authorization,
-            stats_event_sender,
+            app_container.tracker,
+            app_container.authentication_service,
+            app_container.whitelist_authorization,
+            app_container.stats_event_sender,
             Registar::default().give_form(),
             version,
         )

src/bootstrap/jobs/tracker_apis.rs

@@ -159,62 +159,32 @@ async fn start_v1(
 mod tests {
     use std::sync::Arc;
 
-    use tokio::sync::RwLock;
     use torrust_tracker_test_helpers::configuration::ephemeral_public;
 
-    use crate::bootstrap::app::initialize_global_services;
+    use crate::bootstrap::app::{initialize_app_container, initialize_global_services};
     use crate::bootstrap::jobs::tracker_apis::start_job;
-    use crate::core::authentication::handler::KeysHandler;
-    use crate::core::authentication::key::repository::in_memory::InMemoryKeyRepository;
-    use crate::core::authentication::key::repository::persisted::DatabaseKeyRepository;
-    use crate::core::authentication::service;
-    use crate::core::services::{initialize_database, initialize_tracker, initialize_whitelist_manager, statistics};
-    use crate::core::whitelist;
-    use crate::core::whitelist::repository::in_memory::InMemoryWhitelist;
     use crate::servers::apis::Version;
     use crate::servers::registar::Registar;
-    use crate::servers::udp::server::banning::BanService;
-    use crate::servers::udp::server::launcher::MAX_CONNECTION_ID_ERRORS_PER_IP;
 
     #[tokio::test]
     async fn it_should_start_http_tracker() {
         let cfg = Arc::new(ephemeral_public());
         let config = &cfg.http_api.clone().unwrap();
 
-        let ban_service = Arc::new(RwLock::new(BanService::new(MAX_CONNECTION_ID_ERRORS_PER_IP)));
-        let (stats_event_sender, stats_repository) = statistics::setup::factory(cfg.core.tracker_usage_statistics);
-        let stats_event_sender = Arc::new(stats_event_sender);
-        let stats_repository = Arc::new(stats_repository);
-
         initialize_global_services(&cfg);
 
-        let database = initialize_database(&cfg);
-        let in_memory_whitelist = Arc::new(InMemoryWhitelist::default());
-        let whitelist_authorization = Arc::new(whitelist::authorization::Authorization::new(
-            &cfg.core,
-            &in_memory_whitelist.clone(),
-        ));
-        let whitelist_manager = initialize_whitelist_manager(database.clone(), in_memory_whitelist.clone());
-        let db_key_repository = Arc::new(DatabaseKeyRepository::new(&database));
-        let in_memory_key_repository = Arc::new(InMemoryKeyRepository::default());
-        let _authentication_service = Arc::new(service::AuthenticationService::new(&cfg.core, &in_memory_key_repository));
-        let keys_handler = Arc::new(KeysHandler::new(
-            &db_key_repository.clone(),
-            &in_memory_key_repository.clone(),
-        ));
-
-        let tracker = Arc::new(initialize_tracker(&cfg, &database, &whitelist_authorization));
+        let app_container = initialize_app_container(&cfg);
 
         let version = Version::V1;
 
         start_job(
             config,
-            tracker,
-            keys_handler,
-            whitelist_manager,
-            ban_service,
-            stats_event_sender,
-            stats_repository,
+            app_container.tracker,
+            app_container.keys_handler,
+            app_container.whitelist_manager,
+            app_container.ban_service,
+            app_container.stats_event_sender,
+            app_container.stats_repository,
             Registar::default().give_form(),
             version,
         )

src/core/authentication/handler.rs

@@ -267,7 +267,6 @@ mod tests {
 
         fn instantiate_keys_handler_with_configuration(config: &Configuration) -> KeysHandler {
             let database = initialize_database(config);
-
             let db_key_repository = Arc::new(DatabaseKeyRepository::new(&database));
             let in_memory_key_repository = Arc::new(InMemoryKeyRepository::default());
 

src/core/authentication/mod.rs

@@ -50,10 +50,8 @@ mod tests {
             config: &Configuration,
         ) -> (Arc<KeysHandler>, Arc<AuthenticationService>) {
             let database = initialize_database(config);
-
             let db_key_repository = Arc::new(DatabaseKeyRepository::new(&database));
             let in_memory_key_repository = Arc::new(InMemoryKeyRepository::default());
-
             let authentication_service = Arc::new(service::AuthenticationService::new(&config.core, &in_memory_key_repository));
             let keys_handler = Arc::new(KeysHandler::new(
                 &db_key_repository.clone(),

src/servers/apis/server.rs

@@ -343,51 +343,21 @@ impl Launcher {
 mod tests {
     use std::sync::Arc;
 
-    use tokio::sync::RwLock;
     use torrust_tracker_test_helpers::configuration::ephemeral_public;
 
-    use crate::bootstrap::app::initialize_global_services;
+    use crate::bootstrap::app::{initialize_app_container, initialize_global_services};
     use crate::bootstrap::jobs::make_rust_tls;
-    use crate::core::authentication::handler::KeysHandler;
-    use crate::core::authentication::key::repository::in_memory::InMemoryKeyRepository;
-    use crate::core::authentication::key::repository::persisted::DatabaseKeyRepository;
-    use crate::core::authentication::service;
-    use crate::core::services::{initialize_database, initialize_tracker, initialize_whitelist_manager, statistics};
-    use crate::core::whitelist;
-    use crate::core::whitelist::repository::in_memory::InMemoryWhitelist;
     use crate::servers::apis::server::{ApiServer, Launcher};
     use crate::servers::registar::Registar;
-    use crate::servers::udp::server::banning::BanService;
-    use crate::servers::udp::server::launcher::MAX_CONNECTION_ID_ERRORS_PER_IP;
 
     #[tokio::test]
     async fn it_should_be_able_to_start_and_stop() {
         let cfg = Arc::new(ephemeral_public());
         let config = &cfg.http_api.clone().unwrap();
 
-        let ban_service = Arc::new(RwLock::new(BanService::new(MAX_CONNECTION_ID_ERRORS_PER_IP)));
-        let (stats_event_sender, stats_repository) = statistics::setup::factory(cfg.core.tracker_usage_statistics);
-        let stats_event_sender = Arc::new(stats_event_sender);
-        let stats_repository = Arc::new(stats_repository);
-
         initialize_global_services(&cfg);
 
-        let database = initialize_database(&cfg);
-        let in_memory_whitelist = Arc::new(InMemoryWhitelist::default());
-        let whitelist_authorization = Arc::new(whitelist::authorization::Authorization::new(
-            &cfg.core,
-            &in_memory_whitelist.clone(),
-        ));
-        let whitelist_manager = initialize_whitelist_manager(database.clone(), in_memory_whitelist.clone());
-        let db_key_repository = Arc::new(DatabaseKeyRepository::new(&database));
-        let in_memory_key_repository = Arc::new(InMemoryKeyRepository::default());
-        let _authentication_service = Arc::new(service::AuthenticationService::new(&cfg.core, &in_memory_key_repository));
-        let keys_handler = Arc::new(KeysHandler::new(
-            &db_key_repository.clone(),
-            &in_memory_key_repository.clone(),
-        ));
-
-        let tracker = Arc::new(initialize_tracker(&cfg, &database, &whitelist_authorization));
+        let app_container = initialize_app_container(&cfg);
 
         let bind_to = config.bind_address;
 
@@ -403,12 +373,12 @@ mod tests {
 
         let started = stopped
             .start(
-                tracker,
-                keys_handler,
-                whitelist_manager,
-                stats_event_sender,
-                stats_repository,
-                ban_service,
+                app_container.tracker,
+                app_container.keys_handler,
+                app_container.whitelist_manager,
+                app_container.stats_event_sender,
+                app_container.stats_repository,
+                app_container.ban_service,
                 register.give_form(),
                 access_tokens,
             )

src/servers/http/server.rs

@@ -268,43 +268,18 @@ mod tests {
 
     use torrust_tracker_test_helpers::configuration::ephemeral_public;
 
-    use crate::bootstrap::app::initialize_global_services;
+    use crate::bootstrap::app::{initialize_app_container, initialize_global_services};
     use crate::bootstrap::jobs::make_rust_tls;
-    use crate::core::authentication::handler::KeysHandler;
-    use crate::core::authentication::key::repository::in_memory::InMemoryKeyRepository;
-    use crate::core::authentication::key::repository::persisted::DatabaseKeyRepository;
-    use crate::core::authentication::service;
-    use crate::core::services::{initialize_database, initialize_tracker, initialize_whitelist_manager, statistics};
-    use crate::core::whitelist;
-    use crate::core::whitelist::repository::in_memory::InMemoryWhitelist;
     use crate::servers::http::server::{HttpServer, Launcher};
     use crate::servers::registar::Registar;
 
     #[tokio::test]
     async fn it_should_be_able_to_start_and_stop() {
         let cfg = Arc::new(ephemeral_public());
 
-        let (stats_event_sender, _stats_repository) = statistics::setup::factory(cfg.core.tracker_usage_statistics);
-        let stats_event_sender = Arc::new(stats_event_sender);
-
         initialize_global_services(&cfg);
 
-        let database = initialize_database(&cfg);
-        let in_memory_whitelist = Arc::new(InMemoryWhitelist::default());
-        let whitelist_authorization = Arc::new(whitelist::authorization::Authorization::new(
-            &cfg.core,
-            &in_memory_whitelist.clone(),
-        ));
-        let _whitelist_manager = initialize_whitelist_manager(database.clone(), in_memory_whitelist.clone());
-        let db_key_repository = Arc::new(DatabaseKeyRepository::new(&database));
-        let in_memory_key_repository = Arc::new(InMemoryKeyRepository::default());
-        let authentication_service = Arc::new(service::AuthenticationService::new(&cfg.core, &in_memory_key_repository));
-        let _keys_handler = Arc::new(KeysHandler::new(
-            &db_key_repository.clone(),
-            &in_memory_key_repository.clone(),
-        ));
-
-        let tracker = Arc::new(initialize_tracker(&cfg, &database, &whitelist_authorization));
+        let app_container = initialize_app_container(&cfg);
 
         let http_trackers = cfg.http_trackers.clone().expect("missing HTTP trackers configuration");
         let config = &http_trackers[0];
@@ -320,10 +295,10 @@ mod tests {
         let stopped = HttpServer::new(Launcher::new(bind_to, tls));
         let started = stopped
             .start(
-                tracker,
-                authentication_service,
-                whitelist_authorization,
-                stats_event_sender,
+                app_container.tracker,
+                app_container.authentication_service,
+                app_container.whitelist_authorization,
+                app_container.stats_event_sender,
                 register.give_form(),
             )
             .await

src/servers/udp/server/mod.rs

@@ -58,49 +58,20 @@ mod tests {
     use std::sync::Arc;
     use std::time::Duration;
 
-    use tokio::sync::RwLock;
     use torrust_tracker_test_helpers::configuration::ephemeral_public;
 
     use super::spawner::Spawner;
     use super::Server;
-    use crate::bootstrap::app::initialize_global_services;
-    use crate::core::authentication::handler::KeysHandler;
-    use crate::core::authentication::key::repository::in_memory::InMemoryKeyRepository;
-    use crate::core::authentication::key::repository::persisted::DatabaseKeyRepository;
-    use crate::core::authentication::service;
-    use crate::core::services::{initialize_database, initialize_tracker, initialize_whitelist_manager, statistics};
-    use crate::core::whitelist;
-    use crate::core::whitelist::repository::in_memory::InMemoryWhitelist;
+    use crate::bootstrap::app::{initialize_app_container, initialize_global_services};
     use crate::servers::registar::Registar;
-    use crate::servers::udp::server::banning::BanService;
-    use crate::servers::udp::server::launcher::MAX_CONNECTION_ID_ERRORS_PER_IP;
 
     #[tokio::test]
     async fn it_should_be_able_to_start_and_stop() {
         let cfg = Arc::new(ephemeral_public());
 
-        let (stats_event_sender, _stats_repository) = statistics::setup::factory(cfg.core.tracker_usage_statistics);
-        let stats_event_sender = Arc::new(stats_event_sender);
-        let ban_service = Arc::new(RwLock::new(BanService::new(MAX_CONNECTION_ID_ERRORS_PER_IP)));
-
         initialize_global_services(&cfg);
 
-        let database = initialize_database(&cfg);
-        let in_memory_whitelist = Arc::new(InMemoryWhitelist::default());
-        let whitelist_authorization = Arc::new(whitelist::authorization::Authorization::new(
-            &cfg.core,
-            &in_memory_whitelist.clone(),
-        ));
-        let _whitelist_manager = initialize_whitelist_manager(database.clone(), in_memory_whitelist.clone());
-        let db_key_repository = Arc::new(DatabaseKeyRepository::new(&database));
-        let in_memory_key_repository = Arc::new(InMemoryKeyRepository::default());
-        let _authentication_service = Arc::new(service::AuthenticationService::new(&cfg.core, &in_memory_key_repository));
-        let _keys_handler = Arc::new(KeysHandler::new(
-            &db_key_repository.clone(),
-            &in_memory_key_repository.clone(),
-        ));
-
-        let tracker = Arc::new(initialize_tracker(&cfg, &database, &whitelist_authorization));
+        let app_container = initialize_app_container(&cfg);
 
         let udp_trackers = cfg.udp_trackers.clone().expect("missing UDP trackers configuration");
         let config = &udp_trackers[0];
@@ -111,10 +82,10 @@ mod tests {
 
         let started = stopped
             .start(
-                tracker,
-                whitelist_authorization,
-                stats_event_sender,
-                ban_service,
+                app_container.tracker,
+                app_container.whitelist_authorization,
+                app_container.stats_event_sender,
+                app_container.ban_service,
                 register.give_form(),
                 config.cookie_lifetime,
             )
@@ -132,27 +103,9 @@ mod tests {
     async fn it_should_be_able_to_start_and_stop_with_wait() {
         let cfg = Arc::new(ephemeral_public());
 
-        let (stats_event_sender, _stats_repository) = statistics::setup::factory(cfg.core.tracker_usage_statistics);
-        let stats_event_sender = Arc::new(stats_event_sender);
-        let ban_service = Arc::new(RwLock::new(BanService::new(MAX_CONNECTION_ID_ERRORS_PER_IP)));
-
         initialize_global_services(&cfg);
 
-        let database = initialize_database(&cfg);
-        let in_memory_whitelist = Arc::new(InMemoryWhitelist::default());
-        let whitelist_authorization = Arc::new(whitelist::authorization::Authorization::new(
-            &cfg.core,
-            &in_memory_whitelist.clone(),
-        ));
-        let db_key_repository = Arc::new(DatabaseKeyRepository::new(&database));
-        let in_memory_key_repository = Arc::new(InMemoryKeyRepository::default());
-        let _authentication_service = Arc::new(service::AuthenticationService::new(&cfg.core, &in_memory_key_repository));
-        let _keys_handler = Arc::new(KeysHandler::new(
-            &db_key_repository.clone(),
-            &in_memory_key_repository.clone(),
-        ));
-
-        let tracker = Arc::new(initialize_tracker(&cfg, &database, &whitelist_authorization));
+        let app_container = initialize_app_container(&cfg);
 
         let config = &cfg.udp_trackers.as_ref().unwrap().first().unwrap();
         let bind_to = config.bind_address;
@@ -162,10 +115,10 @@ mod tests {
 
         let started = stopped
             .start(
-                tracker,
-                whitelist_authorization,
-                stats_event_sender,
-                ban_service,
+                app_container.tracker,
+                app_container.whitelist_authorization,
+                app_container.stats_event_sender,
+                app_container.ban_service,
                 register.give_form(),
                 config.cookie_lifetime,
             )