Skip to content

Replace lots of hamcrest's assert_that with a builder style #5929

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
merged 7 commits into from
Aug 28, 2018
Merged

Replace lots of hamcrest's assert_that with a builder style #5929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
035b5b9
Remove an unrun "cargo build" ProcessBuilder
dwijnand Aug 24, 2018
e9bfe8f
Inline Execs::_with_stderr
dwijnand Aug 24, 2018
dd0400e
Add #[must_use] to Execs
dwijnand Aug 23, 2018
e8841ee
Extract Execs::match_process
dwijnand Aug 28, 2018
76e840b
Make old Execs methods take not consume self
dwijnand Aug 24, 2018
b5ee363
Wrap ProcessBuilder in Execs & make .cargo return that
dwijnand Aug 28, 2018
85984a8
Migrate from tests fom assert_that/execs to .run()
dwijnand Aug 28, 2018
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
244 changes: 97 additions & 147 deletions tests/testsuite/alt_registry.rs
View file
Open in desktop

Large diffs are not rendered by default.

483 changes: 194 additions & 289 deletions tests/testsuite/bad_config.rs
View file
Open in desktop

Large diffs are not rendered by default.

77 changes: 35 additions & 42 deletions tests/testsuite/bad_manifest_path.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
use support::{basic_bin_manifest, execs, main_file, project};
use support::hamcrest::assert_that;
use support::{basic_bin_manifest, main_file, project};

fn assert_not_a_cargo_toml(command: &str, manifest_path_argument: &str) {
let p = project()
.file("Cargo.toml", &basic_bin_manifest("foo"))
.file("src/foo.rs", &main_file(r#""i am foo""#, &[]))
.build();

assert_that(
p.cargo(command)
.arg("--manifest-path")
.arg(manifest_path_argument)
.cwd(p.root().parent().unwrap()),
execs().with_status(101).with_stderr(
p.cargo(command)
.arg("--manifest-path")
.arg(manifest_path_argument)
.cwd(p.root().parent().unwrap())
.with_status(101)
.with_stderr(
"[ERROR] the manifest-path must be a path \
to a Cargo.toml file",
),
);
).run();
}

fn assert_cargo_toml_doesnt_exist(command: &str, manifest_path_argument: &str) {
Expand All @@ -26,16 +24,15 @@ fn assert_cargo_toml_doesnt_exist(command: &str, manifest_path_argument: &str) {
.collect::<Vec<_>>()
.join("[..]");

assert_that(
p.cargo(command)
.arg("--manifest-path")
.arg(manifest_path_argument)
.cwd(p.root().parent().unwrap()),
execs().with_status(101).with_stderr(format!(
p.cargo(command)
.arg("--manifest-path")
.arg(manifest_path_argument)
.cwd(p.root().parent().unwrap())
.with_status(101)
.with_stderr(format!(
"[ERROR] manifest path `{}` does not exist",
expected_path
)),
);
)).run();
}

#[test]
Expand Down Expand Up @@ -325,14 +322,13 @@ fn verify_project_dir_containing_cargo_toml() {
.file("src/foo.rs", &main_file(r#""i am foo""#, &[]))
.build();

assert_that(
p.cargo("verify-project --manifest-path foo")
.cwd(p.root().parent().unwrap()),
execs().with_status(1).with_stdout(
p.cargo("verify-project --manifest-path foo")
.cwd(p.root().parent().unwrap())
.with_status(1)
.with_stdout(
"{\"invalid\":\"the manifest-path must be a path to a Cargo.toml file\"}\
",
),
);
).run();
}

#[test]
Expand All @@ -342,14 +338,13 @@ fn verify_project_dir_plus_file() {
.file("src/foo.rs", &main_file(r#""i am foo""#, &[]))
.build();

assert_that(
p.cargo("verify-project --manifest-path foo/bar")
.cwd(p.root().parent().unwrap()),
execs().with_status(1).with_stdout(
p.cargo("verify-project --manifest-path foo/bar")
.cwd(p.root().parent().unwrap())
.with_status(1)
.with_stdout(
"{\"invalid\":\"the manifest-path must be a path to a Cargo.toml file\"}\
",
),
);
).run();
}

#[test]
Expand All @@ -359,25 +354,23 @@ fn verify_project_dir_plus_path() {
.file("src/foo.rs", &main_file(r#""i am foo""#, &[]))
.build();

assert_that(
p.cargo("verify-project --manifest-path foo/bar/baz")
.cwd(p.root().parent().unwrap()),
execs().with_status(1).with_stdout(
p.cargo("verify-project --manifest-path foo/bar/baz")
.cwd(p.root().parent().unwrap())
.with_status(1)
.with_stdout(
"{\"invalid\":\"the manifest-path must be a path to a Cargo.toml file\"}\
",
),
);
).run();
}

#[test]
fn verify_project_dir_to_nonexistent_cargo_toml() {
let p = project().build();
assert_that(
p.cargo("verify-project --manifest-path foo/bar/baz/Cargo.toml")
.cwd(p.root().parent().unwrap()),
execs().with_status(1).with_stdout(
p.cargo("verify-project --manifest-path foo/bar/baz/Cargo.toml")
.cwd(p.root().parent().unwrap())
.with_status(1)
.with_stdout(
"{\"invalid\":\"manifest path `foo[..]bar[..]baz[..]Cargo.toml` does not exist\"}\
",
),
);
).run();
}
Loading