Make the file path field private in TestFile

Author: FastAlien

src/auth_file_watcher.test.rs

@@ -23,7 +23,7 @@ fn when_monitored_file_does_not_exist_then_new_does_not_return_error() {
 fn when_new_line_is_added_to_file_then_update_callback_is_called() {
     let mut file = TestFile::with_unique_name();
     let mut auth_file_watcher =
-        AuthFileWatcher::new(&file.filepath).expect("Error creating AuthFileWatcher");
+        AuthFileWatcher::new(file.path()).expect("Error creating AuthFileWatcher");
     expect_no_update_callback_call(&mut auth_file_watcher);
     expect_update_callback_is_called_when_file_is_modified(&mut file, &mut auth_file_watcher);
 }
@@ -49,7 +49,7 @@ fn expect_update_callback_is_called_when_file_is_modified(
 fn when_more_than_one_line_is_added_then_update_callback_is_called_for_each_line() {
     let mut file = TestFile::with_unique_name();
     let mut auth_file_watcher =
-        AuthFileWatcher::new(&file.filepath).expect("Error creating AuthFileWatcher");
+        AuthFileWatcher::new(file.path()).expect("Error creating AuthFileWatcher");
     expect_no_update_callback_call(&mut auth_file_watcher);
 
     let mut call_count = 0;
@@ -75,7 +75,7 @@ fn when_more_than_one_line_is_added_then_update_callback_is_called_for_each_line
 fn when_new_file_was_created_after_old_was_deleted_then_changes_in_new_file_are_monitored() {
     let mut file = TestFile::with_unique_name();
     let mut auth_file_watcher =
-        AuthFileWatcher::new(&file.filepath).expect("Error creating AuthFileWatcher");
+        AuthFileWatcher::new(file.path()).expect("Error creating AuthFileWatcher");
     expect_no_update_callback_call(&mut auth_file_watcher);
 
     file.remove();
@@ -97,10 +97,10 @@ fn expect_no_update_callback_call(auth_file_watcher: &mut AuthFileWatcher) {
 fn when_new_file_has_been_created_after_old_was_renamed_then_changes_in_new_file_are_monitored() {
     let mut file = TestFile::with_unique_name();
     let mut auth_file_watcher =
-        AuthFileWatcher::new(&file.filepath).expect("Error creating AuthFileWatcher");
+        AuthFileWatcher::new(file.path()).expect("Error creating AuthFileWatcher");
     expect_no_update_callback_call(&mut auth_file_watcher);
 
-    rename_file(&file.filepath, "auth-monitor-test.bak");
+    rename_file(file.path(), "auth-monitor-test.bak");
     expect_no_update_callback_call(&mut auth_file_watcher);
 
     file.create();
@@ -113,7 +113,7 @@ fn when_new_file_has_been_created_after_old_was_renamed_then_changes_in_new_file
 fn when_monitored_file_has_been_truncated_then_changes_are_still_monitored() {
     let mut file = TestFile::with_unique_name();
     let mut auth_file_watcher =
-        AuthFileWatcher::new(&file.filepath).expect("Error creating AuthFileWatcher");
+        AuthFileWatcher::new(file.path()).expect("Error creating AuthFileWatcher");
     expect_no_update_callback_call(&mut auth_file_watcher);
 
     file.truncate();

src/auth_monitor.test.rs

@@ -23,7 +23,7 @@ pub fn when_max_failed_attempts_limit_is_reached_then_update_callback_is_called(
     for max_failed_attempts in 2..10 {
         let mut file = TestFile::with_unique_name();
         let mut auth_monitor = AuthMonitor::new(AuthMonitorParams {
-            filepath: file.filepath.clone(),
+            filepath: String::from(file.path()),
             options: AuthMonitorOptions {
                 max_failed_attempts,
                 ..AuthMonitorOptions::default()
@@ -103,7 +103,7 @@ pub fn when_reset_after_seconds_passed_then_failed_attempts_count_is_reset() {
     };
     let mut file = TestFile::with_unique_name();
     let mut auth_monitor = AuthMonitor::new(AuthMonitorParams {
-        filepath: file.filepath.clone(),
+        filepath: String::from(file.path()),
         options,
     })
     .expect("Error creating AuthMonitor");
@@ -137,7 +137,7 @@ pub fn when_max_failed_attempts_limit_is_reached_before_update_is_called_then_up
     for max_failed_attempts in 2..10 {
         let mut file = TestFile::with_unique_name();
         let mut auth_monitor = AuthMonitor::new(AuthMonitorParams {
-            filepath: file.filepath.clone(),
+            filepath: String::from(file.path()),
             options: AuthMonitorOptions {
                 max_failed_attempts,
                 ..AuthMonitorOptions::default()

src/test_utils/test_file.rs

@@ -7,7 +7,7 @@ use std::sync::atomic::{AtomicUsize, Ordering};
 use chrono::Local;
 
 pub struct TestFile {
-    pub filepath: String,
+    path: String,
     file: File,
 }
 
@@ -18,9 +18,9 @@ impl TestFile {
             Self::next_id(),
             Local::now().timestamp_micros()
         );
-        let filepath_buffer = temp_dir().join(filename);
-        let filepath = filepath_buffer.to_str().expect("Error creating filepath");
-        return Self::new(filepath);
+        let path_buffer = temp_dir().join(filename);
+        let path = path_buffer.to_str().expect("Error creating file path");
+        return Self::new(path);
     }
 
     fn next_id() -> usize {
@@ -31,14 +31,18 @@ impl TestFile {
     pub fn new(path: &str) -> TestFile {
         println!("Creating test file: {}", path);
         return TestFile {
-            filepath: String::from(path),
+            path: String::from(path),
             file: File::create(path).expect("Error creating test file"),
         };
     }
 
+    pub fn path(&self) -> &str {
+        return &self.path;
+    }
+
     pub fn create(&mut self) {
-        println!("Creating test file: {}", &self.filepath);
-        self.file = File::create(&self.filepath).expect("Error creating test file");
+        println!("Creating test file: {}", &self.path);
+        self.file = File::create(&self.path).expect("Error creating test file");
     }
 
     pub fn write(&mut self, message: &str) {
@@ -51,13 +55,13 @@ impl TestFile {
     }
 
     pub fn truncate(&mut self) {
-        println!("Truncating test file: {}", self.filepath);
+        println!("Truncating test file: {}", self.path);
         self.file.set_len(0).expect("Error truncating file");
     }
 
     pub fn remove(&mut self) {
-        println!("Removing test file: {}", self.filepath);
-        remove_file(&self.filepath).expect("Unable to remove test file");
+        println!("Removing test file: {}", self.path);
+        remove_file(&self.path).expect("Unable to remove test file");
     }
 }