Skip to content

tests/more: run all tests with terminal_simulation #6121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tertsdiepraam wants to merge 1 commit into from
Closed

tests/more: run all tests with terminal_simulation #6121

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
142 changes: 123 additions & 19 deletions tests/by-util/test_more.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ use std::io::IsTerminal;
#[test]
fn test_more_no_arg() {
if std::io::stdout().is_terminal() {
new_ucmd!().fails().stderr_contains("more: bad usage");
new_ucmd!()
.terminal_simulation(true)
.fails()
.stderr_contains("more: bad usage");
}
}

Expand All @@ -21,44 +24,136 @@ fn test_valid_arg() {
let file = "test_file";
at.touch(file);

scene.ucmd().arg(file).arg("-c").succeeds();
scene.ucmd().arg(file).arg("--print-over").succeeds();
scene
.ucmd()
.terminal_simulation(true)
.arg(file)
.arg("-c")
.succeeds();
scene
.ucmd()
.terminal_simulation(true)
.arg(file)
.arg("--print-over")
.succeeds();

scene.ucmd().arg(file).arg("-p").succeeds();
scene.ucmd().arg(file).arg("--clean-print").succeeds();
scene
.ucmd()
.terminal_simulation(true)
.arg(file)
.arg("-p")
.succeeds();
scene
.ucmd()
.terminal_simulation(true)
.arg(file)
.arg("--clean-print")
.succeeds();

scene.ucmd().arg(file).arg("-s").succeeds();
scene.ucmd().arg(file).arg("--squeeze").succeeds();
scene
.ucmd()
.terminal_simulation(true)
.arg(file)
.arg("-s")
.succeeds();
scene
.ucmd()
.terminal_simulation(true)
.arg(file)
.arg("--squeeze")
.succeeds();

scene.ucmd().arg(file).arg("-u").succeeds();
scene.ucmd().arg(file).arg("--plain").succeeds();
scene
.ucmd()
.terminal_simulation(true)
.arg(file)
.arg("-u")
.succeeds();
scene
.ucmd()
.terminal_simulation(true)
.arg(file)
.arg("--plain")
.succeeds();

scene.ucmd().arg(file).arg("-n").arg("10").succeeds();
scene.ucmd().arg(file).arg("--lines").arg("0").succeeds();
scene.ucmd().arg(file).arg("--number").arg("0").succeeds();
scene
.ucmd()
.terminal_simulation(true)
.arg(file)
.arg("-n")
.arg("10")
.succeeds();
scene
.ucmd()
.terminal_simulation(true)
.arg(file)
.arg("--lines")
.arg("0")
.succeeds();
scene
.ucmd()
.terminal_simulation(true)
.arg(file)
.arg("--number")
.arg("0")
.succeeds();

scene.ucmd().arg(file).arg("-F").arg("10").succeeds();
scene
.ucmd()
.terminal_simulation(true)
.arg(file)
.arg("-F")
.arg("10")
.succeeds();
scene
.ucmd()
.terminal_simulation(true)
.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();
scene
.ucmd()
.terminal_simulation(true)
.arg(file)
.arg("-P")
.arg("something")
.succeeds();
scene
.ucmd()
.terminal_simulation(true)
.arg(file)
.arg("--pattern")
.arg("-1")
.succeeds();
}
}

#[test]
fn test_invalid_arg() {
if std::io::stdout().is_terminal() {
new_ucmd!().arg("--invalid").fails();
new_ucmd!()
.terminal_simulation(true)
.arg("--invalid")
.fails();

new_ucmd!().arg("--lines").arg("-10").fails();
new_ucmd!().arg("--number").arg("-10").fails();
new_ucmd!()
.terminal_simulation(true)
.arg("--lines")
.arg("-10")
.fails();
new_ucmd!()
.terminal_simulation(true)
.arg("--number")
.arg("-10")
.fails();

new_ucmd!().arg("--from-line").arg("-10").fails();
new_ucmd!()
.terminal_simulation(true)
.arg("--from-line")
.arg("-10")
.fails();
}
}

Expand All @@ -75,6 +170,7 @@ fn test_argument_from_file() {
// output all lines
scene
.ucmd()
.terminal_simulation(true)
.arg("-F")
.arg("0")
.arg(file)
Expand All @@ -86,6 +182,7 @@ fn test_argument_from_file() {
// output only the second line
scene
.ucmd()
.terminal_simulation(true)
.arg("-F")
.arg("2")
.arg(file)
Expand All @@ -103,6 +200,7 @@ fn test_more_dir_arg() {
// but I am leaving this for later
if std::io::stdout().is_terminal() {
new_ucmd!()
.terminal_simulation(true)
.arg(".")
.succeeds()
.stderr_contains("'.' is a directory.");
Expand All @@ -121,6 +219,7 @@ fn test_more_invalid_file_perms() {
at.make_file("invalid-perms.txt");
set_permissions(at.plus("invalid-perms.txt"), permissions).unwrap();
ucmd.arg("invalid-perms.txt")
.terminal_simulation(true)
.succeeds()
.stderr_contains("permission denied");
}
Expand All @@ -132,10 +231,12 @@ fn test_more_error_on_single_arg() {
let ts = TestScenario::new("more");
ts.fixtures.mkdir_all("folder");
ts.ucmd()
.terminal_simulation(true)
.arg("folder")
.succeeds()
.stderr_contains("is a directory");
ts.ucmd()
.terminal_simulation(true)
.arg("file1")
.succeeds()
.stderr_contains("No such file or directory");
Expand All @@ -149,6 +250,7 @@ fn test_more_error_on_multiple_files() {
ts.fixtures.mkdir_all("folder");
ts.fixtures.make_file("file1");
ts.ucmd()
.terminal_simulation(true)
.arg("folder")
.arg("file2")
.arg("file1")
Expand Down Expand Up @@ -178,6 +280,7 @@ fn test_more_pattern_found() {
// output only the second line "line2"
scene
.ucmd()
.terminal_simulation(true)
.arg("-P")
.arg("line2")
.arg(file)
Expand All @@ -201,6 +304,7 @@ fn test_more_pattern_not_found() {

scene
.ucmd()
.terminal_simulation(true)
.arg("-P")
.arg("something")
.arg(file)
Expand Down