diff --git a/tests/test_exact_output.rs b/tests/test_exact_output.rs index 1cb968ea..08e8f7f5 100644 --- a/tests/test_exact_output.rs +++ b/tests/test_exact_output.rs @@ -58,7 +58,7 @@ fn initialize() { }); } -fn run_cmd>(command_args: Vec) -> Output { +fn run_cmd>(command_args: &[T]) -> Output { initialize(); let mut to_run = &mut Command::cargo_bin("dust").unwrap(); for p in command_args { @@ -67,7 +67,7 @@ fn run_cmd>(command_args: Vec) -> Output { to_run.unwrap() } -fn exact_stdout_test>(command_args: Vec, valid_stdout: Vec) { +fn exact_stdout_test>(command_args: &[T], valid_stdout: Vec) { let to_run = run_cmd(command_args); let stdout_output = str::from_utf8(&to_run.stdout).unwrap().to_owned(); @@ -82,7 +82,7 @@ fn exact_stdout_test>(command_args: Vec, valid_stdout: Vec>(command_args: Vec, valid_stderr: String) { +fn exact_stderr_test>(command_args: &[T], valid_stderr: String) { let to_run = run_cmd(command_args); let stderr_output = str::from_utf8(&to_run.stderr).unwrap().trim(); @@ -94,20 +94,20 @@ fn exact_stderr_test>(command_args: Vec, valid_stderr: String #[test] pub fn test_main_basic() { // -c is no color mode - This makes testing much simpler - exact_stdout_test(vec!["-c", "-B", "/tmp/test_dir/"], main_output()); + exact_stdout_test(&["-c", "-B", "/tmp/test_dir/"], main_output()); } #[cfg_attr(target_os = "windows", ignore)] #[test] pub fn test_main_multi_arg() { - let command_args = vec![ + let command_args = [ "-c", "-B", "/tmp/test_dir/many/", "/tmp/test_dir", "/tmp/test_dir", ]; - exact_stdout_test(command_args, main_output()); + exact_stdout_test(&command_args, main_output()); } fn main_output() -> Vec { @@ -137,8 +137,8 @@ fn main_output() -> Vec { #[cfg_attr(target_os = "windows", ignore)] #[test] pub fn test_main_long_paths() { - let command_args = vec!["-c", "-p", "-B", "/tmp/test_dir/"]; - exact_stdout_test(command_args, main_output_long_paths()); + let command_args = ["-c", "-p", "-B", "/tmp/test_dir/"]; + exact_stdout_test(&command_args, main_output_long_paths()); } fn main_output_long_paths() -> Vec { @@ -165,8 +165,8 @@ fn main_output_long_paths() -> Vec { #[cfg_attr(target_os = "windows", ignore)] #[test] pub fn test_substring_of_names_and_long_names() { - let command_args = vec!["-c", "-B", "/tmp/test_dir2"]; - exact_stdout_test(command_args, no_substring_of_names_output()); + let command_args = ["-c", "-B", "/tmp/test_dir2"]; + exact_stdout_test(&command_args, no_substring_of_names_output()); } fn no_substring_of_names_output() -> Vec { @@ -199,8 +199,8 @@ fn no_substring_of_names_output() -> Vec { #[cfg_attr(target_os = "windows", ignore)] #[test] pub fn test_unicode_directories() { - let command_args = vec!["-c", "-B", "/tmp/test_dir_unicode"]; - exact_stdout_test(command_args, unicode_dir()); + let command_args = ["-c", "-B", "/tmp/test_dir_unicode"]; + exact_stdout_test(&command_args, unicode_dir()); } fn unicode_dir() -> Vec { @@ -226,8 +226,8 @@ fn unicode_dir() -> Vec { #[cfg_attr(target_os = "windows", ignore)] #[test] pub fn test_apparent_size() { - let command_args = vec!["-c", "-s", "-b", "/tmp/test_dir"]; - exact_stdout_test(command_args, apparent_size_output()); + let command_args = ["-c", "-s", "-b", "/tmp/test_dir"]; + exact_stdout_test(&command_args, apparent_size_output()); } fn apparent_size_output() -> Vec { @@ -252,22 +252,22 @@ fn apparent_size_output() -> Vec { #[cfg_attr(target_os = "windows", ignore)] #[test] pub fn test_permission_normal() { - let command_args = vec![UNREADABLE_DIR_PATH]; + let command_args = [UNREADABLE_DIR_PATH]; let permission_msg = r#"Did not have permissions for all directories (add --print-errors to see errors)"# .trim() .to_string(); - exact_stderr_test(command_args, permission_msg); + exact_stderr_test(&command_args, permission_msg); } #[cfg_attr(target_os = "windows", ignore)] #[test] pub fn test_permission_flag() { // add the flag to CLI - let command_args = vec!["--print-errors", UNREADABLE_DIR_PATH]; + let command_args = ["--print-errors", UNREADABLE_DIR_PATH]; let permission_msg = format!( "Did not have permissions for directories: {}", UNREADABLE_DIR_PATH ); - exact_stderr_test(command_args, permission_msg); + exact_stderr_test(&command_args, permission_msg); }