Merge pull request #7446 from cakebaker/true_false_remove_newline_in_version_string

true,false: remove unnecessary newline from version string

Author: sylvestre

src/uu/false/src/false.rs

@@ -28,7 +28,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
         let error = match e.kind() {
             clap::error::ErrorKind::DisplayHelp => command.print_help(),
             clap::error::ErrorKind::DisplayVersion => {
-                writeln!(std::io::stdout(), "{}", command.render_version())
+                write!(std::io::stdout(), "{}", command.render_version())
             }
             _ => Ok(()),
         };

src/uu/true/src/true.rs

@@ -22,7 +22,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
         let error = match e.kind() {
             clap::error::ErrorKind::DisplayHelp => command.print_help(),
             clap::error::ErrorKind::DisplayVersion => {
-                writeln!(std::io::stdout(), "{}", command.render_version())
+                write!(std::io::stdout(), "{}", command.render_version())
             }
             _ => Ok(()),
         };

tests/by-util/test_false.rs

@@ -2,21 +2,23 @@
 //
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
+
 use crate::common::util::TestScenario;
+use regex::Regex;
+
 #[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "netbsd"))]
 use std::fs::OpenOptions;
 
 #[test]
-fn test_exit_code() {
-    new_ucmd!().fails();
+fn test_no_args() {
+    new_ucmd!().fails().no_output();
 }
 
 #[test]
 fn test_version() {
-    new_ucmd!()
-        .args(&["--version"])
-        .fails()
-        .stdout_contains("false");
+    let re = Regex::new(r"^false .*\d+\.\d+\.\d+\n$").unwrap();
+
+    new_ucmd!().args(&["--version"]).fails().stdout_matches(&re);
 }
 
 #[test]
@@ -30,7 +32,7 @@ fn test_help() {
 #[test]
 fn test_short_options() {
     for option in ["-h", "-V"] {
-        new_ucmd!().arg(option).fails().stdout_is("");
+        new_ucmd!().arg(option).fails().no_output();
     }
 }
 
@@ -39,7 +41,7 @@ fn test_conflict() {
     new_ucmd!()
         .args(&["--help", "--version"])
         .fails()
-        .stdout_is("");
+        .no_output();
 }
 
 #[test]

tests/by-util/test_true.rs

@@ -2,21 +2,26 @@
 //
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
+
 use crate::common::util::TestScenario;
+use regex::Regex;
+
 #[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "netbsd"))]
 use std::fs::OpenOptions;
 
 #[test]
-fn test_exit_code() {
-    new_ucmd!().succeeds();
+fn test_no_args() {
+    new_ucmd!().succeeds().no_output();
 }
 
 #[test]
 fn test_version() {
+    let re = Regex::new(r"^true .*\d+\.\d+\.\d+\n$").unwrap();
+
     new_ucmd!()
         .args(&["--version"])
         .succeeds()
-        .stdout_contains("true");
+        .stdout_matches(&re);
 }
 
 #[test]
@@ -30,7 +35,7 @@ fn test_help() {
 #[test]
 fn test_short_options() {
     for option in ["-h", "-V"] {
-        new_ucmd!().arg(option).succeeds().stdout_is("");
+        new_ucmd!().arg(option).succeeds().no_output();
     }
 }
 
@@ -39,7 +44,7 @@ fn test_conflict() {
     new_ucmd!()
         .args(&["--help", "--version"])
         .succeeds()
-        .stdout_is("");
+        .no_output();
 }
 
 #[test]