move impl from test/file_utilities to test_utilities

Author: jayrave

cli/tests/file_utilities/mod.rs

@@ -2,7 +2,7 @@ use std::process::{Command, Output};
 
 use tempfile::TempDir;
 
-mod file_utilities;
+use test_utilities;
 
 #[test]
 fn succeeds_with_mapping() {
@@ -111,7 +111,7 @@ fn assert_status_and_stdout(output: Output) {
 }
 
 fn assert_output_files(temp_dir: TempDir, expected_output_dir_path: &str) {
-    file_utilities::assert_eq_of_file_contents_to_either_or(
+    test_utilities::file::assert_eq_of_file_contents_to_either_or(
         &format!("{}/to_localize_1.csv", temp_dir.path().to_str().unwrap()),
         &format!("{}/es_fr.csv", expected_output_dir_path),
         &format!("{}/fr_es.csv", expected_output_dir_path),

cli/tests/localize.rs

@@ -5,8 +5,6 @@ use tempfile::TempDir;
 
 use test_utilities;
 
-mod file_utilities;
-
 #[test]
 fn succeeds_with_mapping() {
     execute_with_copied_sample_res(
@@ -70,7 +68,7 @@ fn warns_if_nothing_new_localized() {
                     "run",
                     "localized",
                     "--res-dir",
-                    &output_res_path.clone(),
+                    &output_res_path,
                     "--input-file",
                     "./tests_data/localized/warn/input/localized.csv",
                 ])
@@ -194,12 +192,12 @@ fn assert_status_and_stdout(output: Output) {
 }
 
 fn assert_output_files(output_res_path: String) {
-    file_utilities::assert_eq_of_file_contents(
+    test_utilities::file::assert_eq_of_file_contents(
         "./tests_data/localized/success/output/french_strings.xml",
         &format!("{}/values-fr/strings.xml", output_res_path),
     );
 
-    file_utilities::assert_eq_of_file_contents(
+    test_utilities::file::assert_eq_of_file_contents(
         "./tests_data/localized/success/output/spanish_strings.xml",
         &format!("{}/values-es/strings.xml", output_res_path),
     );

cli/tests/localized.rs

@@ -240,7 +240,7 @@ mod tests {
 
         xml_writer::write(&mut zh_strings.file, chinese_android_strings.clone()).unwrap();
 
-        fs::create_dir_all(localized_dir_path.clone()).unwrap();
+        fs::create_dir_all(localized_dir_path).unwrap();
         let mut localized_file = File::create(localized_file_path.clone()).unwrap();
         localized_file
             .write_all(

core/src/localized.rs

@@ -199,8 +199,8 @@ mod tests {
                     }],
                 }),
                 missing_strings_error: Some(missing_strings::MissingStrings {
-                    extra_in_default_locale: vec![default_s1.clone(), default_s2.clone()],
-                    extra_in_foreign_locale: vec![spanish_s1.clone(), spanish_s2.clone()],
+                    extra_in_default_locale: vec![default_s1, default_s2],
+                    extra_in_foreign_locale: vec![spanish_s1, spanish_s2],
                 }),
             },
         ];

core/src/validate/formatter.rs

@@ -239,7 +239,7 @@ mod tests {
 
             Some(missing_strings::MissingStrings {
                 extra_in_foreign_locale: vec![],
-                extra_in_default_locale: vec![default_s1.clone()],
+                extra_in_default_locale: vec![default_s1],
             })
         } else {
             missing_strings_error_for_fr = None;

core/src/validate/validator.rs

@@ -1,3 +1,4 @@
+use crate::eq;
 use std::fs::File;
 use std::io::Read;
 use std::io::Write;
@@ -14,3 +15,28 @@ pub fn write_content<P: AsRef<Path>, S: Into<String>>(file_path: P, content: S)
     let mut file = File::create(file_path).unwrap();
     file.write_all(content.into().as_bytes()).unwrap();
 }
+
+pub fn assert_eq_of_file_contents(actual_file_path: &str, expected_file_path: &str) {
+    let actual_file_lines = read_file_contents_as_lines(actual_file_path);
+    let expected_file_lines = read_file_contents_as_lines(expected_file_path);
+    assert_eq!(actual_file_lines, expected_file_lines)
+}
+
+pub fn assert_eq_of_file_contents_to_either_or(
+    actual_file_path: &str,
+    expected_file_path1: &str,
+    expected_file_path2: &str,
+) {
+    eq::assert_eq_to_either_or(
+        read_file_contents_as_lines(actual_file_path),
+        read_file_contents_as_lines(expected_file_path1),
+        read_file_contents_as_lines(expected_file_path2),
+    );
+}
+
+fn read_file_contents_as_lines(file_path: &str) -> Vec<String> {
+    // By default, the writers we employ, use \n as line terminator which
+    // wouldn't match when run on Windows! To work around this, we are using
+    // lines instead (`String#lines` takes care of handling both \n & \r\n)
+    read_content(file_path).lines().map(String::from).collect()
+}