Skip to content

[chore] Replace deprecated assert_cmd::Command::cargo_bin usage #16

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

Merged
thepacketgeek merged 1 commit into from
Dec 20, 2025
Merged

[chore] Replace deprecated assert_cmd::Command::cargo_bin usage #16

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
82 changes: 28 additions & 54 deletions tests/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,29 @@
use std::fs;

use assert_cmd::cargo_bin;
use assert_cmd::Command;
use predicates::prelude::*;

use clap_stdin::StdinError;

#[test]
fn test_maybe_stdin_positional_arg() {
Command::cargo_bin("maybe_stdin_positional_arg")
.unwrap()
Command::new(cargo_bin!("maybe_stdin_positional_arg"))
.args(["FIRST", "--second", "SECOND"])
.assert()
.success()
.stdout(predicate::str::starts_with(
r#"Args { first: "FIRST", second: Some("SECOND") }"#,
));
Command::cargo_bin("maybe_stdin_positional_arg")
.unwrap()
Command::new(cargo_bin!("maybe_stdin_positional_arg"))
.args(["-", "--second", "SECOND"])
.write_stdin("TESTING")
.assert()
.success()
.stdout(predicate::str::starts_with(
r#"Args { first: "TESTING", second: Some("SECOND") }"#,
));
Command::cargo_bin("maybe_stdin_positional_arg")
.unwrap()
Command::new(cargo_bin!("maybe_stdin_positional_arg"))
.args(["FIRST"])
.write_stdin("TESTING")
.assert()
Expand All @@ -37,25 +35,22 @@ fn test_maybe_stdin_positional_arg() {

#[test]
fn test_maybe_stdin_optional_arg() {
Command::cargo_bin("maybe_stdin_optional_arg")
.unwrap()
Command::new(cargo_bin!("maybe_stdin_optional_arg"))
.args(["FIRST", "--second", "2"])
.assert()
.success()
.stdout(predicate::str::starts_with(
r#"Args { first: "FIRST", second: Some(2) }"#,
));
Command::cargo_bin("maybe_stdin_optional_arg")
.unwrap()
Command::new(cargo_bin!("maybe_stdin_optional_arg"))
.write_stdin("2\n")
.args(["FIRST", "--second", "-"])
.assert()
.success()
.stdout(predicate::str::starts_with(
r#"Args { first: "FIRST", second: Some(2) }"#,
));
Command::cargo_bin("maybe_stdin_optional_arg")
.unwrap()
Command::new(cargo_bin!("maybe_stdin_optional_arg"))
.args(["FIRST"])
.write_stdin("TESTING")
.assert()
Expand All @@ -67,16 +62,14 @@ fn test_maybe_stdin_optional_arg() {

#[test]
fn test_maybe_stdin_twice() {
Command::cargo_bin("maybe_stdin_twice")
.unwrap()
Command::new(cargo_bin!("maybe_stdin_twice"))
.args(["FIRST", "2"])
.assert()
.success()
.stdout(predicate::str::starts_with(
r#"Args { first: "FIRST", second: 2 }"#,
));
Command::cargo_bin("maybe_stdin_twice")
.unwrap()
Command::new(cargo_bin!("maybe_stdin_twice"))
.write_stdin("2")
.args(["FIRST", "-"])
.assert()
Expand All @@ -86,8 +79,7 @@ fn test_maybe_stdin_twice() {
));

// Actually using stdin twice will fail because there's no value the second time
Command::cargo_bin("maybe_stdin_twice")
.unwrap()
Command::new(cargo_bin!("maybe_stdin_twice"))
.write_stdin("3")
.args(["-", "-"])
.assert()
Expand All @@ -103,25 +95,22 @@ fn test_file_or_stdin_positional_arg() {
fs::write(&tmp, "FILE").expect("couldn't write to temp file");
let tmp_path = tmp.path().to_str().unwrap();

Command::cargo_bin("file_or_stdin_positional_arg")
.unwrap()
Command::new(cargo_bin!("file_or_stdin_positional_arg"))
.args([&tmp_path, "--second", "SECOND"])
.assert()
.success()
.stdout(predicate::str::starts_with(
r#"FIRST: FILE; SECOND: Some("SECOND")"#,
));
Command::cargo_bin("file_or_stdin_positional_arg")
.unwrap()
Command::new(cargo_bin!("file_or_stdin_positional_arg"))
.args(["--second", "SECOND"])
.write_stdin("STDIN")
.assert()
.success()
.stdout(predicate::str::starts_with(
r#"FIRST: STDIN; SECOND: Some("SECOND")"#,
));
Command::cargo_bin("file_or_stdin_positional_arg")
.unwrap()
Command::new(cargo_bin!("file_or_stdin_positional_arg"))
.args([&tmp_path])
.write_stdin("TESTING")
.assert()
Expand All @@ -136,25 +125,22 @@ fn test_file_or_stdin_optional_arg() {
fs::write(&tmp, "2").expect("couldn't write to temp file");
let tmp_path = tmp.path().to_str().unwrap();

Command::cargo_bin("file_or_stdin_optional_arg")
.unwrap()
Command::new(cargo_bin!("file_or_stdin_optional_arg"))
.args(["FIRST", "--second", &tmp_path])
.assert()
.success()
.stdout(predicate::str::starts_with(
r#"FIRST: FIRST, SECOND: Some(2)"#,
));
Command::cargo_bin("file_or_stdin_optional_arg")
.unwrap()
Command::new(cargo_bin!("file_or_stdin_optional_arg"))
.write_stdin("2\n")
.args(["FIRST", "--second", "-"])
.assert()
.success()
.stdout(predicate::str::starts_with(
r#"FIRST: FIRST, SECOND: Some(2)"#,
));
Command::cargo_bin("file_or_stdin_optional_arg")
.unwrap()
Command::new(cargo_bin!("file_or_stdin_optional_arg"))
.args(["FIRST"])
.write_stdin("TESTING")
.assert()
Expand All @@ -168,23 +154,20 @@ fn test_file_or_stdin_twice() {
fs::write(&tmp, "FILE").expect("couldn't write to temp file");
let tmp_path = tmp.path().to_str().unwrap();

Command::cargo_bin("file_or_stdin_twice")
.unwrap()
Command::new(cargo_bin!("file_or_stdin_twice"))
.args([&tmp_path, "2"])
.assert()
.success()
.stdout(predicate::str::starts_with(r#"FIRST: FILE; SECOND: 2"#));
Command::cargo_bin("file_or_stdin_twice")
.unwrap()
Command::new(cargo_bin!("file_or_stdin_twice"))
.write_stdin("2")
.args([&tmp_path, "-"])
.assert()
.success()
.stdout(predicate::str::starts_with(r#"FIRST: FILE; SECOND: 2"#));

// Actually using stdin twice will fail because there's no value the second time
Command::cargo_bin("file_or_stdin_twice")
.unwrap()
Command::new(cargo_bin!("file_or_stdin_twice"))
.write_stdin("3")
.args(["-", "-"])
.assert()
Expand All @@ -200,25 +183,22 @@ fn test_is_stdin() {
fs::write(&tmp, "FILE").expect("couldn't write to temp file");
let tmp_path = tmp.path().to_str().unwrap();

Command::cargo_bin("is_stdin")
.unwrap()
Command::new(cargo_bin!("is_stdin"))
.args([&tmp_path, "2"])
.assert()
.success()
.stdout(predicate::str::contains(
r#"FIRST is_stdin: false; SECOND is_stdin: false"#,
));
Command::cargo_bin("is_stdin")
.unwrap()
Command::new(cargo_bin!("is_stdin"))
.write_stdin("2")
.args([&tmp_path, "-"])
.assert()
.success()
.stdout(predicate::str::contains(
r#"FIRST is_stdin: false; SECOND is_stdin: true"#,
));
Command::cargo_bin("is_stdin")
.unwrap()
Command::new(cargo_bin!("is_stdin"))
.write_stdin("testing")
.args(["-", "2"])
.assert()
Expand All @@ -233,23 +213,20 @@ fn test_file_or_stdout_positional_args() {
let tmp = tempfile::NamedTempFile::new().expect("couldn't create temp file");
let tmp_path = tmp.path().to_str().unwrap();

Command::cargo_bin("file_or_stdout_positional_arg")
.unwrap()
Command::new(cargo_bin!("file_or_stdout_positional_arg"))
.args(["-v", "FILE", tmp_path])
.assert()
.success();
let output = String::from_utf8_lossy(&std::fs::read(&tmp_path).unwrap()).to_string();
assert_eq!(&output, "FILE\n");

Command::cargo_bin("file_or_stdout_positional_arg")
.unwrap()
Command::new(cargo_bin!("file_or_stdout_positional_arg"))
.args(["-v", "FILE", "-"])
.assert()
.success()
.stdout(predicate::str::starts_with(r#"FILE"#));

Command::cargo_bin("file_or_stdout_positional_arg")
.unwrap()
Command::new(cargo_bin!("file_or_stdout_positional_arg"))
.args(["-v", "FILE"])
.assert()
.success()
Expand All @@ -261,23 +238,20 @@ fn test_file_or_stdout_optional_args() {
let tmp = tempfile::NamedTempFile::new().expect("couldn't create temp file");
let tmp_path = tmp.path().to_str().unwrap();

Command::cargo_bin("file_or_stdout_optional_arg")
.unwrap()
Command::new(cargo_bin!("file_or_stdout_optional_arg"))
.args(["-v", "FILE", "--output", tmp_path])
.assert()
.success();
let output = String::from_utf8_lossy(&std::fs::read(&tmp_path).unwrap()).to_string();
assert_eq!(&output, "FILE\n");

Command::cargo_bin("file_or_stdout_optional_arg")
.unwrap()
Command::new(cargo_bin!("file_or_stdout_optional_arg"))
.args(["-v", "FILE", "--output", "-"])
.assert()
.success()
.stdout(predicate::str::starts_with(r#"FILE"#));

Command::cargo_bin("file_or_stdout_optional_arg")
.unwrap()
Command::new(cargo_bin!("file_or_stdout_optional_arg"))
.args(["-v", "FILE"])
.assert()
.success()
Expand Down