From 750969dce57729f13d60e10db8e550c9ef03b627 Mon Sep 17 00:00:00 2001 From: Jose Celano Date: Thu, 10 Nov 2022 22:25:15 +0000 Subject: [PATCH] refactor: [#56] rename methods --- .../testers/torrent_tester.rs | 2 +- .../testers/tracker_key_tester.rs | 2 +- .../testers/user_tester.rs | 2 +- .../from_v1_0_0_to_v2_0_0/upgrader.rs | 25 +++++++++++-------- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/tests/upgrades/from_v1_0_0_to_v2_0_0/testers/torrent_tester.rs b/tests/upgrades/from_v1_0_0_to_v2_0_0/testers/torrent_tester.rs index 33ea8b1a..3f636506 100644 --- a/tests/upgrades/from_v1_0_0_to_v2_0_0/testers/torrent_tester.rs +++ b/tests/upgrades/from_v1_0_0_to_v2_0_0/testers/torrent_tester.rs @@ -55,7 +55,7 @@ impl TorrentTester { .unwrap(); } - pub async fn assert(&self, upload_path: &str) { + pub async fn assert_data_in_destiny_db(&self, upload_path: &str) { let filepath = self.torrent_file_path(upload_path, self.test_data.torrent.torrent_id); let torrent_file = read_torrent_from_file(&filepath).unwrap(); diff --git a/tests/upgrades/from_v1_0_0_to_v2_0_0/testers/tracker_key_tester.rs b/tests/upgrades/from_v1_0_0_to_v2_0_0/testers/tracker_key_tester.rs index 68b591a8..3dfa4904 100644 --- a/tests/upgrades/from_v1_0_0_to_v2_0_0/testers/tracker_key_tester.rs +++ b/tests/upgrades/from_v1_0_0_to_v2_0_0/testers/tracker_key_tester.rs @@ -41,7 +41,7 @@ impl TrackerKeyTester { } /// Table `torrust_tracker_keys` - pub async fn assert(&self) { + pub async fn assert_data_in_destiny_db(&self) { let imported_key = self .destiny_database .get_tracker_key(self.test_data.tracker_key.key_id) diff --git a/tests/upgrades/from_v1_0_0_to_v2_0_0/testers/user_tester.rs b/tests/upgrades/from_v1_0_0_to_v2_0_0/testers/user_tester.rs index e0d001f8..d349a47f 100644 --- a/tests/upgrades/from_v1_0_0_to_v2_0_0/testers/user_tester.rs +++ b/tests/upgrades/from_v1_0_0_to_v2_0_0/testers/user_tester.rs @@ -47,7 +47,7 @@ impl UserTester { .unwrap(); } - pub async fn assert(&self) { + pub async fn assert_data_in_destiny_db(&self) { self.assert_user().await; self.assert_user_profile().await; self.assert_user_authentication().await; 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 ccda3537..8f3c33ca 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 @@ -44,7 +44,7 @@ async fn upgrades_data_from_version_v1_0_0_to_v2_0_0() { // The datetime when the upgrader is executed let execution_time = datetime_iso_8601(); - // Load data into database v1 + // Load data into source database in version v1.0.0 let user_tester = UserTester::new( source_database.clone(), @@ -68,18 +68,21 @@ async fn upgrades_data_from_version_v1_0_0_to_v2_0_0() { torrent_tester.load_data_into_source_db().await; // Run the upgrader - let args = Arguments { - source_database_file: source_database_file.clone(), - destiny_database_file: destiny_database_file.clone(), - upload_path: upload_path.clone(), - }; - upgrade(&args, &execution_time).await; + upgrade( + &Arguments { + source_database_file: source_database_file.clone(), + destiny_database_file: destiny_database_file.clone(), + upload_path: upload_path.clone(), + }, + &execution_time, + ) + .await; - // Assertions in database v2 + // Assertions for data transferred to the new database in version v2.0.0 - user_tester.assert().await; - tracker_key_tester.assert().await; - torrent_tester.assert(&upload_path).await; + user_tester.assert_data_in_destiny_db().await; + tracker_key_tester.assert_data_in_destiny_db().await; + torrent_tester.assert_data_in_destiny_db(&upload_path).await; } async fn source_db_connection(source_database_file: &str) -> Arc {