From cd95987f2b85a8073042d28897e9e63131119812 Mon Sep 17 00:00:00 2001 From: Jose Celano Date: Thu, 10 Nov 2022 17:50:03 +0000 Subject: [PATCH] refactor: [#56] rename mod and variables --- .../from_v1_0_0_to_v2_0_0/testers/mod.rs | 4 ++-- ...r_keys_tester.rs => tracker_key_tester.rs} | 4 ++-- .../{user_data_tester.rs => user_tester.rs} | 4 ++-- .../from_v1_0_0_to_v2_0_0/upgrader.rs | 20 +++++++++---------- 4 files changed, 16 insertions(+), 16 deletions(-) rename tests/upgrades/from_v1_0_0_to_v2_0_0/testers/{tracker_keys_tester.rs => tracker_key_tester.rs} (97%) rename tests/upgrades/from_v1_0_0_to_v2_0_0/testers/{user_data_tester.rs => user_tester.rs} (98%) diff --git a/tests/upgrades/from_v1_0_0_to_v2_0_0/testers/mod.rs b/tests/upgrades/from_v1_0_0_to_v2_0_0/testers/mod.rs index 6445ec5b..730b5149 100644 --- a/tests/upgrades/from_v1_0_0_to_v2_0_0/testers/mod.rs +++ b/tests/upgrades/from_v1_0_0_to_v2_0_0/testers/mod.rs @@ -1,3 +1,3 @@ pub mod torrent_tester; -pub mod tracker_keys_tester; -pub mod user_data_tester; +pub mod tracker_key_tester; +pub mod user_tester; diff --git a/tests/upgrades/from_v1_0_0_to_v2_0_0/testers/tracker_keys_tester.rs b/tests/upgrades/from_v1_0_0_to_v2_0_0/testers/tracker_key_tester.rs similarity index 97% rename from tests/upgrades/from_v1_0_0_to_v2_0_0/testers/tracker_keys_tester.rs rename to tests/upgrades/from_v1_0_0_to_v2_0_0/testers/tracker_key_tester.rs index dd6eefdb..68b591a8 100644 --- a/tests/upgrades/from_v1_0_0_to_v2_0_0/testers/tracker_keys_tester.rs +++ b/tests/upgrades/from_v1_0_0_to_v2_0_0/testers/tracker_key_tester.rs @@ -3,7 +3,7 @@ use crate::upgrades::from_v1_0_0_to_v2_0_0::sqlite_v2_0_0::SqliteDatabaseV2_0_0; use std::sync::Arc; use torrust_index_backend::upgrades::from_v1_0_0_to_v2_0_0::databases::sqlite_v1_0_0::TrackerKeyRecordV1; -pub struct TrackerKeysTester { +pub struct TrackerKeyTester { source_database: Arc, destiny_database: Arc, test_data: TestData, @@ -13,7 +13,7 @@ pub struct TestData { pub tracker_key: TrackerKeyRecordV1, } -impl TrackerKeysTester { +impl TrackerKeyTester { pub fn new( source_database: Arc, destiny_database: Arc, diff --git a/tests/upgrades/from_v1_0_0_to_v2_0_0/testers/user_data_tester.rs b/tests/upgrades/from_v1_0_0_to_v2_0_0/testers/user_tester.rs similarity index 98% rename from tests/upgrades/from_v1_0_0_to_v2_0_0/testers/user_data_tester.rs rename to tests/upgrades/from_v1_0_0_to_v2_0_0/testers/user_tester.rs index 1f6f7238..e0d001f8 100644 --- a/tests/upgrades/from_v1_0_0_to_v2_0_0/testers/user_data_tester.rs +++ b/tests/upgrades/from_v1_0_0_to_v2_0_0/testers/user_tester.rs @@ -6,7 +6,7 @@ use rand_core::OsRng; use std::sync::Arc; use torrust_index_backend::upgrades::from_v1_0_0_to_v2_0_0::databases::sqlite_v1_0_0::UserRecordV1; -pub struct UserDataTester { +pub struct UserTester { source_database: Arc, destiny_database: Arc, execution_time: String, @@ -17,7 +17,7 @@ pub struct TestData { pub user: UserRecordV1, } -impl UserDataTester { +impl UserTester { pub fn new( source_database: Arc, destiny_database: Arc, diff --git a/tests/upgrades/from_v1_0_0_to_v2_0_0/upgrader.rs b/tests/upgrades/from_v1_0_0_to_v2_0_0/upgrader.rs index 22093624..ccda3537 100644 --- a/tests/upgrades/from_v1_0_0_to_v2_0_0/upgrader.rs +++ b/tests/upgrades/from_v1_0_0_to_v2_0_0/upgrader.rs @@ -14,8 +14,8 @@ use crate::upgrades::from_v1_0_0_to_v2_0_0::sqlite_v1_0_0::SqliteDatabaseV1_0_0; use crate::upgrades::from_v1_0_0_to_v2_0_0::sqlite_v2_0_0::SqliteDatabaseV2_0_0; use crate::upgrades::from_v1_0_0_to_v2_0_0::testers::torrent_tester::TorrentTester; -use crate::upgrades::from_v1_0_0_to_v2_0_0::testers::tracker_keys_tester::TrackerKeysTester; -use crate::upgrades::from_v1_0_0_to_v2_0_0::testers::user_data_tester::UserDataTester; +use crate::upgrades::from_v1_0_0_to_v2_0_0::testers::tracker_key_tester::TrackerKeyTester; +use crate::upgrades::from_v1_0_0_to_v2_0_0::testers::user_tester::UserTester; use std::fs; use std::sync::Arc; use torrust_index_backend::upgrades::from_v1_0_0_to_v2_0_0::upgrader::{ @@ -46,24 +46,24 @@ async fn upgrades_data_from_version_v1_0_0_to_v2_0_0() { // Load data into database v1 - let user_data_tester = UserDataTester::new( + let user_tester = UserTester::new( source_database.clone(), destiny_database.clone(), &execution_time, ); - user_data_tester.load_data_into_source_db().await; + user_tester.load_data_into_source_db().await; - let tracker_keys_tester = TrackerKeysTester::new( + let tracker_key_tester = TrackerKeyTester::new( source_database.clone(), destiny_database.clone(), - user_data_tester.test_data.user.user_id, + user_tester.test_data.user.user_id, ); - tracker_keys_tester.load_data_into_source_db().await; + tracker_key_tester.load_data_into_source_db().await; let torrent_tester = TorrentTester::new( source_database.clone(), destiny_database.clone(), - &user_data_tester.test_data.user, + &user_tester.test_data.user, ); torrent_tester.load_data_into_source_db().await; @@ -77,8 +77,8 @@ async fn upgrades_data_from_version_v1_0_0_to_v2_0_0() { // Assertions in database v2 - user_data_tester.assert().await; - tracker_keys_tester.assert().await; + user_tester.assert().await; + tracker_key_tester.assert().await; torrent_tester.assert(&upload_path).await; }