Merge pull request #8293 from RenjiSann/uutest-refactor

tests: Fix macros, rewrite tests to use idiomatic macros

Author: sylvestre

tests/by-util/test_arch.rs

@@ -3,8 +3,6 @@
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
 use uutests::new_ucmd;
-use uutests::util::TestScenario;
-use uutests::util_name;
 
 #[test]
 fn test_arch() {

tests/by-util/test_base32.rs

@@ -5,8 +5,6 @@
 //
 
 use uutests::new_ucmd;
-use uutests::util::TestScenario;
-use uutests::util_name;
 
 #[test]
 fn test_encode() {
@@ -114,10 +112,10 @@ fn test_wrap() {
 
 #[test]
 fn test_wrap_no_arg() {
+    let expected_stderr = "a value is required for '--wrap <COLS>' but none was supplied";
+
     for wrap_param in ["-w", "--wrap"] {
-        let ts = TestScenario::new(util_name!());
-        let expected_stderr = "a value is required for '--wrap <COLS>' but none was supplied";
-        ts.ucmd()
+        new_ucmd!()
             .arg(wrap_param)
             .fails()
             .stderr_contains(expected_stderr)

tests/by-util/test_base64.rs

@@ -4,7 +4,6 @@
 // file that was distributed with this source code.
 use uutests::new_ucmd;
 use uutests::util::TestScenario;
-use uutests::util_name;
 
 #[test]
 fn test_encode() {

tests/by-util/test_basename.rs

@@ -7,8 +7,6 @@
 #[cfg(any(unix, target_os = "redox"))]
 use std::ffi::OsStr;
 use uutests::new_ucmd;
-use uutests::util::TestScenario;
-use uutests::util_name;
 
 #[test]
 fn test_help() {

tests/by-util/test_basenc.rs

@@ -6,8 +6,6 @@
 // spell-checker: ignore (encodings) lsbf msbf
 
 use uutests::new_ucmd;
-use uutests::util::TestScenario;
-use uutests::util_name;
 
 #[test]
 fn test_z85_not_padded_decode() {

tests/by-util/test_chcon.rs

@@ -12,8 +12,6 @@ use std::{io, iter, str};
 
 use uutests::at_and_ucmd;
 use uutests::new_ucmd;
-use uutests::util::TestScenario;
-use uutests::util_name;
 
 #[test]
 fn version() {

tests/by-util/test_chgrp.rs

@@ -5,10 +5,9 @@
 // spell-checker:ignore (words) nosuchgroup groupname
 
 use uucore::process::getegid;
-use uutests::at_and_ucmd;
-use uutests::new_ucmd;
-use uutests::util::TestScenario;
-use uutests::util_name;
+use uutests::{at_and_ucmd, new_ucmd};
+#[cfg(not(target_vendor = "apple"))]
+use uutests::{util::TestScenario, util_name};
 
 #[test]
 fn test_invalid_option() {
@@ -370,7 +369,7 @@ fn test_traverse_symlinks() {
         (&["-P"][..], false, false),
         (&["-L"][..], true, true),
     ] {
-        let scenario = TestScenario::new("chgrp");
+        let scenario = TestScenario::new(util_name!());
 
         let (at, mut ucmd) = (scenario.fixtures.clone(), scenario.ucmd());
 

tests/by-util/test_csplit.rs

@@ -5,8 +5,6 @@
 use glob::glob;
 use uutests::at_and_ucmd;
 use uutests::new_ucmd;
-use uutests::util::TestScenario;
-use uutests::util_name;
 
 /// Returns a string of numbers with the given range, each on a new line.
 /// The upper bound is not included.

tests/by-util/test_cut.rs

@@ -7,8 +7,6 @@
 
 use uutests::at_and_ucmd;
 use uutests::new_ucmd;
-use uutests::util::TestScenario;
-use uutests::util_name;
 
 static INPUT: &str = "lists.txt";
 

tests/by-util/test_df.rs

@@ -15,8 +15,6 @@ use std::collections::HashSet;
 #[cfg(not(any(target_os = "freebsd", target_os = "windows")))]
 use uutests::at_and_ucmd;
 use uutests::new_ucmd;
-use uutests::util::TestScenario;
-use uutests::util_name;
 
 #[test]
 fn test_invalid_arg() {