remove redundancy

Author: HaitaiNg

tests/by_util/domainname.rs

@@ -1,94 +1,65 @@
 use assert_cmd::Command;
 use predicates::prelude::*;
 
-#[test]
-fn dnsdomainname_help() {
-    Command::cargo_bin("dnsdomainname")
+/// Assert that `--help` succeeds and prints either the binary name or Usage text
+fn assert_help(bin: &str) {
+    Command::cargo_bin(bin)
         .unwrap()
         .arg("--help")
         .assert()
         .success()
         .stdout(
-            predicate::str::contains("dnsdomainname")
+            predicate::str::contains(bin)
                 .or(predicate::str::contains("Usage")),
         );
 }
 
-#[test]
-fn domainname_help() {
-    Command::cargo_bin("domainname")
+/// Assert that `--version` succeeds and prints the binary name
+fn assert_version(bin: &str) {
+    Command::cargo_bin(bin)
         .unwrap()
-        .arg("--help")
+        .arg("--version")
         .assert()
         .success()
-        .stdout(
-            predicate::str::contains("domainname")
-                .or(predicate::str::contains("Usage")),
-        );
+        .stdout(predicate::str::contains(bin));
+}
+
+#[test]
+fn dnsdomainname_help() {
+    assert_help("dnsdomainname");
+}
+
+#[test]
+fn domainname_help() {
+    assert_help("domainname");
 }
 
 #[test]
 fn nisdomainname_help() {
-    Command::cargo_bin("nisdomainname")
-        .unwrap()
-        .arg("--help")
-        .assert()
-        .success()
-        .stdout(
-            predicate::str::contains("nisdomainname")
-                .or(predicate::str::contains("Usage")),
-        );
+    assert_help("nisdomainname");
 }
 
 #[test]
 fn ypdomainname_help() {
-    Command::cargo_bin("ypdomainname")
-        .unwrap()
-        .arg("--help")
-        .assert()
-        .success()
-        .stdout(
-            predicate::str::contains("ypdomainname")
-                .or(predicate::str::contains("Usage")),
-        );
+    assert_help("ypdomainname");
 }
 
 #[test]
 fn dnsdomainname_version() {
-    Command::cargo_bin("dnsdomainname")
-        .unwrap()
-        .arg("--version")
-        .assert()
-        .success()
-        .stdout(predicate::str::contains("dnsdomainname"));
+    assert_version("dnsdomainname");
 }
 
 #[test]
 fn domainname_version() {
-    Command::cargo_bin("domainname")
-        .unwrap()
-        .arg("--version")
-        .assert()
-        .success()
-        .stdout(predicate::str::contains("domainname"));
+    assert_version("domainname");
 }
 
 #[test]
 fn nisdomainname_version() {
-    Command::cargo_bin("nisdomainname")
-        .unwrap()
-        .arg("--version")
-        .assert()
-        .success()
-        .stdout(predicate::str::contains("nisdomainname"));
+    assert_version("nisdomainname");
 }
 
 #[test]
 fn ypdomainname_version() {
-    Command::cargo_bin("ypdomainname")
-        .unwrap()
-        .arg("--version")
-        .assert()
-        .success()
-        .stdout(predicate::str::contains("ypdomainname"));
+    assert_version("ypdomainname");
 }

tests/tests.rs

@@ -1,18 +1,3 @@
-use std::env;
-use std::sync::Once;
-
-static INIT: Once = Once::new();
-
-fn init_binary_path() {
-    INIT.call_once(|| {
-        if let Ok(binary_path) = env::var("CARGO_BIN_EXE_hostname") {
-            unsafe {
-                env::set_var("UUTESTS_BINARY_PATH", binary_path);
-            }
-        }
-    });
-}
-
 #[cfg(feature = "hostname")]
 #[path = "by_util/hostname.rs"]
 mod test_hostname;