RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 11:37:44 +00:00
Code Issues Activity

more: fix incorrect tests

Browse source
This commit is contained in:
Daniel Hofstetter 2024-03-22 15:13:53 +01:00
parent d9b2fec43d
commit 5e6fa49ef5
2 changed files with 32 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/uu/more/src/more.rs
View file

@ -3,11 +3,9 @@
// For the full copyright and license information, please view the LICENSE // For the full copyright and license information, please view the LICENSE
// file that was distributed with this source code. // file that was distributed with this source code.
// spell-checker:ignore (methods) isnt
use std::{ use std::{
fs::File, fs::File,
io::{stdin, stdout, BufReader, IsTerminal, Read, Stdout, Write}, io::{stdin, stdout, BufReader, Read, Stdout, Write},
panic::set_hook, panic::set_hook,
path::Path, path::Path,
time::Duration, time::Duration,
@ -159,13 +157,14 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
buff.clear(); buff.clear();
} }
reset_term(&mut stdout); reset_term(&mut stdout);
} else if !std::io::stdin().is_terminal() { } else {
stdin().read_to_string(&mut buff).unwrap(); stdin().read_to_string(&mut buff).unwrap();
if buff.is_empty() {
return Err(UUsageError::new(1, "bad usage"));
}
let mut stdout = setup_term(); let mut stdout = setup_term();
more(&buff, &mut stdout, false, None, None, &mut options)?; more(&buff, &mut stdout, false, None, None, &mut options)?;
reset_term(&mut stdout); reset_term(&mut stdout);
} else {
return Err(UUsageError::new(1, "bad usage"));
} }
Ok(()) Ok(())
} }

44
tests/by-util/test_more.rs
View file

@ -7,36 +7,46 @@ use std::io::IsTerminal;
#[test] #[test]
fn test_more_no_arg() { fn test_more_no_arg() {
// Reading from stdin is now supported, so this must succeed
if std::io::stdout().is_terminal() { if std::io::stdout().is_terminal() {
new_ucmd!().succeeds(); new_ucmd!().fails().stderr_contains("more: bad usage");
} }
} }
#[test] #[test]
fn test_valid_arg() { fn test_valid_arg() {
if std::io::stdout().is_terminal() { if std::io::stdout().is_terminal() {
new_ucmd!().arg("-c").succeeds(); let scene = TestScenario::new(util_name!());
new_ucmd!().arg("--print-over").succeeds(); let at = &scene.fixtures;
new_ucmd!().arg("-p").succeeds(); let file = "test_file";
new_ucmd!().arg("--clean-print").succeeds(); at.touch(file);
new_ucmd!().arg("-s").succeeds(); scene.ucmd().arg(file).arg("-c").succeeds();
new_ucmd!().arg("--squeeze").succeeds(); scene.ucmd().arg(file).arg("--print-over").succeeds();
new_ucmd!().arg("-u").succeeds(); scene.ucmd().arg(file).arg("-p").succeeds();
new_ucmd!().arg("--plain").succeeds(); scene.ucmd().arg(file).arg("--clean-print").succeeds();
new_ucmd!().arg("-n").arg("10").succeeds(); scene.ucmd().arg(file).arg("-s").succeeds();
new_ucmd!().arg("--lines").arg("0").succeeds(); scene.ucmd().arg(file).arg("--squeeze").succeeds();
new_ucmd!().arg("--number").arg("0").succeeds();
new_ucmd!().arg("-F").arg("10").succeeds(); scene.ucmd().arg(file).arg("-u").succeeds();
new_ucmd!().arg("--from-line").arg("0").succeeds(); scene.ucmd().arg(file).arg("--plain").succeeds();
new_ucmd!().arg("-P").arg("something").succeeds(); scene.ucmd().arg(file).arg("-n").arg("10").succeeds();
new_ucmd!().arg("--pattern").arg("-1").succeeds(); scene.ucmd().arg(file).arg("--lines").arg("0").succeeds();
scene.ucmd().arg(file).arg("--number").arg("0").succeeds();
scene.ucmd().arg(file).arg("-F").arg("10").succeeds();
scene
.ucmd()
.arg(file)
.arg("--from-line")
.arg("0")
.succeeds();
scene.ucmd().arg(file).arg("-P").arg("something").succeeds();
scene.ucmd().arg(file).arg("--pattern").arg("-1").succeeds();
} }
} }