Skip to content
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

Further reduce assert_that usage #5942

Merged
merged 12 commits into from
Aug 29, 2018
Merged

Further reduce assert_that usage #5942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2554afe
Make Project::process return Execs
dwijnand Aug 28, 2018
21d9c4a
Replace some bare ProcessBuilder usage with Execs
dwijnand Aug 28, 2018
b63e0e6
Replace Output hamcrest matchers for Execs
dwijnand Aug 28, 2018
923d183
Drop reference to the [/] macro in ARCHITECTURE.md
dwijnand Aug 28, 2018
c083880
Update reference to .stream() in ARCHITECTURE.md
dwijnand Aug 28, 2018
21ee66e
Remove a dead comment in testsuite/support/mod.rs
dwijnand Aug 28, 2018
6626211
Replace .exec_with_output() usage with .run()
dwijnand Aug 28, 2018
a173fc0
Replace .exec_with_output() usage with .with_stdout_contains
dwijnand Aug 28, 2018
f16b95e
Make last two .exec_with_output() usages set Execs to ran
dwijnand Aug 28, 2018
b611750
Allow .build_command() to set Execs to ran
dwijnand Aug 28, 2018
e509118
Enable Drop for Execs
dwijnand Aug 28, 2018
63b34b6
Revert back to some .exec_with_output() usage
dwijnand Aug 29, 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
17 changes: 5 additions & 12 deletions ARCHITECTURE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,24 +83,17 @@ rust source code is created in a temporary directory, `cargo` binary
is invoked via `std::process::Command` and then stdout and stderr are
verified against the expected output. To simplify testing, several
macros of the form `[MACRO]` are used in the expected output. For
example, `[..]` matches any string and `[/]` matches `/` on Unixes and
`\` on windows.
example, `[..]` matches any string.

To see stdout and stderr streams of the subordinate process, add `.stream()`
call to `execs()`:
To see stdout and stderr streams of the subordinate process, add `.stream()`
call to the built-up `Execs`:

```rust
// Before
assert_that(
p.cargo("run"),
execs()
);
p.cargo("run").run();

// After
assert_that(
p.cargo("run"),
execs().stream()
);
p.cargo("run").stream().run();
```

Alternatively to build and run a custom version of cargo simply run `cargo build`
Expand Down
31 changes: 8 additions & 23 deletions tests/testsuite/bench.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
use std::str;

use cargo::util::process;
use support::hamcrest::{assert_that, existing_file};
use support::is_nightly;
use support::paths::CargoPathExt;
use support::{basic_bin_manifest, basic_lib_manifest, basic_manifest, execs, project};
use support::{basic_bin_manifest, basic_lib_manifest, basic_manifest, project};

#[test]
fn cargo_bench_simple() {
Expand Down Expand Up @@ -38,7 +35,7 @@ fn cargo_bench_simple() {
p.cargo("build").run();
assert_that(&p.bin("foo"), existing_file());

assert_that(process(&p.bin("foo")), execs().with_stdout("hello\n"));
p.process(&p.bin("foo")).with_stdout("hello\n").run();

p.cargo("bench")
.with_stderr(&format!(
Expand Down Expand Up @@ -269,23 +266,11 @@ fn many_similar_names() {
"#,
).build();

let output = p.cargo("bench").exec_with_output().unwrap();
let output = str::from_utf8(&output.stdout).unwrap();
assert!(
output.contains("test bin_bench"),
"bin_bench missing\n{}",
output
);
assert!(
output.contains("test lib_bench"),
"lib_bench missing\n{}",
output
);
assert!(
output.contains("test bench_bench"),
"bench_bench missing\n{}",
output
);
p.cargo("bench")
.with_stdout_contains("test bin_bench ... bench: 0 ns/iter (+/- 0)")
.with_stdout_contains("test lib_bench ... bench: 0 ns/iter (+/- 0)")
.with_stdout_contains("test bench_bench ... bench: 0 ns/iter (+/- 0)")
.run();
}

#[test]
Expand Down Expand Up @@ -319,7 +304,7 @@ fn cargo_bench_failing_test() {
p.cargo("build").run();
assert_that(&p.bin("foo"), existing_file());

assert_that(process(&p.bin("foo")), execs().with_stdout("hello\n"));
p.process(&p.bin("foo")).with_stdout("hello\n").run();

// Force libtest into serial execution so that the test header will be printed.
p.cargo("bench -- --test-threads=1")
Expand Down
100 changes: 45 additions & 55 deletions tests/testsuite/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@ use std::fs::{self, File};
use std::io::prelude::*;

use cargo::util::paths::dylib_path_envvar;
use cargo::util::process;
use support::hamcrest::{assert_that, existing_dir, existing_file, is_not};
use support::paths::{root, CargoPathExt};
use support::registry::Package;
use support::ProjectBuilder;
use support::{
basic_bin_manifest, basic_lib_manifest, basic_manifest, is_nightly, rustc_host, sleep_ms,
};
use support::{execs, main_file, project, Execs};
use support::{main_file, project, Execs};

#[test]
fn cargo_compile_simple() {
Expand All @@ -23,7 +22,7 @@ fn cargo_compile_simple() {
p.cargo("build").run();
assert_that(&p.bin("foo"), existing_file());

assert_that(process(&p.bin("foo")), execs().with_stdout("i am foo\n"));
p.process(&p.bin("foo")).with_stdout("i am foo\n").run();
}

#[test]
Expand Down Expand Up @@ -530,7 +529,7 @@ fn cargo_compile_with_warnings_in_a_dep_package() {

assert_that(&p.bin("foo"), existing_file());

assert_that(process(&p.bin("foo")), execs().with_stdout("test passed\n"));
p.process(&p.bin("foo")).with_stdout("test passed\n").run();
}

#[test]
Expand Down Expand Up @@ -583,13 +582,13 @@ fn cargo_compile_with_nested_deps_inferred() {
"#,
).build();

p.cargo("build").exec_with_output().unwrap();
p.cargo("build").run();

assert_that(&p.bin("foo"), existing_file());
assert_that(&p.bin("libbar.rlib"), is_not(existing_file()));
assert_that(&p.bin("libbaz.rlib"), is_not(existing_file()));

assert_that(process(&p.bin("foo")), execs().with_stdout("test passed\n"));
p.process(&p.bin("foo")).with_stdout("test passed\n").run();
}

#[test]
Expand Down Expand Up @@ -642,13 +641,13 @@ fn cargo_compile_with_nested_deps_correct_bin() {
"#,
).build();

p.cargo("build").exec_with_output().unwrap();
p.cargo("build").run();

assert_that(&p.bin("foo"), existing_file());
assert_that(&p.bin("libbar.rlib"), is_not(existing_file()));
assert_that(&p.bin("libbaz.rlib"), is_not(existing_file()));

assert_that(process(&p.bin("foo")), execs().with_stdout("test passed\n"));
p.process(&p.bin("foo")).with_stdout("test passed\n").run();
}

#[test]
Expand Down Expand Up @@ -702,13 +701,13 @@ fn cargo_compile_with_nested_deps_shorthand() {
"#,
).build();

p.cargo("build").exec_with_output().unwrap();
p.cargo("build").run();

assert_that(&p.bin("foo"), existing_file());
assert_that(&p.bin("libbar.rlib"), is_not(existing_file()));
assert_that(&p.bin("libbaz.rlib"), is_not(existing_file()));

assert_that(process(&p.bin("foo")), execs().with_stdout("test passed\n"));
p.process(&p.bin("foo")).with_stdout("test passed\n").run();
}

#[test]
Expand Down Expand Up @@ -774,7 +773,7 @@ fn cargo_compile_with_nested_deps_longhand() {
assert_that(&p.bin("libbar.rlib"), is_not(existing_file()));
assert_that(&p.bin("libbaz.rlib"), is_not(existing_file()));

assert_that(process(&p.bin("foo")), execs().with_stdout("test passed\n"));
p.process(&p.bin("foo")).with_stdout("test passed\n").run();
}

// Check that Cargo gives a sensible error if a dependency can't be found
Expand Down Expand Up @@ -1156,7 +1155,7 @@ fn compile_offline_while_transitive_dep_not_cached() {
.build();

// simulate download bar, but fail to download baz
let _out = p.cargo("build").exec_with_output();
p.cargo("build").with_status(101).run();

drop(File::create(baz_path).ok().unwrap().write_all(&content));

Expand Down Expand Up @@ -1378,10 +1377,9 @@ fn crate_env_vars() {
p.cargo("build -v").run();

println!("bin");
assert_that(
process(&p.bin("foo")),
execs().with_stdout(&format!("0-5-1 @ alpha.1 in {}\n", p.root().display())),
);
p.process(&p.bin("foo"))
.with_stdout(&format!("0-5-1 @ alpha.1 in {}\n", p.root().display()))
.run();

println!("test");
p.cargo("test -v").run();
Expand Down Expand Up @@ -1425,10 +1423,9 @@ fn crate_authors_env_vars() {
p.cargo("build -v").run();

println!("bin");
assert_that(
process(&p.bin("foo")),
execs().with_stdout("wycats@example.com:neikos@example.com"),
);
p.process(&p.bin("foo"))
.with_stdout("wycats@example.com:neikos@example.com")
.run();

println!("test");
p.cargo("test -v").run();
Expand Down Expand Up @@ -1584,7 +1581,7 @@ fn ignore_broken_symlinks() {
p.cargo("build").run();
assert_that(&p.bin("foo"), existing_file());

assert_that(process(&p.bin("foo")), execs().with_stdout("i am foo\n"));
p.process(&p.bin("foo")).with_stdout("i am foo\n").run();
}

#[test]
Expand Down Expand Up @@ -1787,14 +1784,12 @@ fn explicit_examples() {
).build();

p.cargo("test -v").run();
assert_that(
process(&p.bin("examples/hello")),
execs().with_stdout("Hello, World!\n"),
);
assert_that(
process(&p.bin("examples/goodbye")),
execs().with_stdout("Goodbye, World!\n"),
);
p.process(&p.bin("examples/hello"))
.with_stdout("Hello, World!\n")
.run();
p.process(&p.bin("examples/goodbye"))
.with_stdout("Goodbye, World!\n")
.run();
}

#[test]
Expand Down Expand Up @@ -1948,14 +1943,12 @@ fn implicit_examples() {
).build();

p.cargo("test").run();
assert_that(
process(&p.bin("examples/hello")),
execs().with_stdout("Hello, World!\n"),
);
assert_that(
process(&p.bin("examples/goodbye")),
execs().with_stdout("Goodbye, World!\n"),
);
p.process(&p.bin("examples/hello"))
.with_stdout("Hello, World!\n")
.run();
p.process(&p.bin("examples/goodbye"))
.with_stdout("Goodbye, World!\n")
.run();
}

#[test]
Expand All @@ -1976,7 +1969,7 @@ fn standard_build_no_ndebug() {
).build();

p.cargo("build").run();
assert_that(process(&p.bin("foo")), execs().with_stdout("slow\n"));
p.process(&p.bin("foo")).with_stdout("slow\n").run();
}

#[test]
Expand All @@ -1997,18 +1990,15 @@ fn release_build_ndebug() {
).build();

p.cargo("build --release").run();
assert_that(
process(&p.release_bin("foo")),
execs().with_stdout("fast\n"),
);
p.process(&p.release_bin("foo")).with_stdout("fast\n").run();
}

#[test]
fn inferred_main_bin() {
let p = project().file("src/main.rs", "fn main() {}").build();

p.cargo("build").run();
assert_that(process(&p.bin("foo")), execs());
p.process(&p.bin("foo")).run();
}

#[test]
Expand Down Expand Up @@ -2043,7 +2033,7 @@ fn bad_cargo_toml_in_target_dir() {
.build();

p.cargo("build").run();
assert_that(process(&p.bin("foo")), execs());
p.process(&p.bin("foo")).run();
}

#[test]
Expand Down Expand Up @@ -2417,10 +2407,10 @@ fn cargo_platform_specific_dependency_wrong_platform() {
"invalid rust file, should not be compiled",
).build();

p.cargo("build").exec_with_output().unwrap();
p.cargo("build").run();

assert_that(&p.bin("foo"), existing_file());
assert_that(process(&p.bin("foo")), execs());
p.process(&p.bin("foo")).run();

let loc = p.root().join("Cargo.lock");
let mut lockfile = String::new();
Expand Down Expand Up @@ -2534,13 +2524,13 @@ fn example_bin_same_name() {
.file("examples/foo.rs", "fn main() {}")
.build();

p.cargo("test --no-run -v").exec_with_output().unwrap();
p.cargo("test --no-run -v").run();

assert_that(&p.bin("foo"), is_not(existing_file()));
// We expect a file of the form bin/foo-{metadata_hash}
assert_that(&p.bin("examples/foo"), existing_file());

p.cargo("test --no-run -v").exec_with_output().unwrap();
p.cargo("test --no-run -v").run();

assert_that(&p.bin("foo"), is_not(existing_file()));
// We expect a file of the form bin/foo-{metadata_hash}
Expand Down Expand Up @@ -2958,7 +2948,7 @@ fn build_multiple_packages() {
p.cargo("build -p d1 -p d2 -p foo").run();

assert_that(&p.bin("foo"), existing_file());
assert_that(process(&p.bin("foo")), execs().with_stdout("i am foo\n"));
p.process(&p.bin("foo")).with_stdout("i am foo\n").run();

let d1_path = &p
.build_dir()
Expand All @@ -2970,10 +2960,10 @@ fn build_multiple_packages() {
.join(format!("d2{}", env::consts::EXE_SUFFIX));

assert_that(d1_path, existing_file());
assert_that(process(d1_path), execs().with_stdout("d1"));
p.process(d1_path).with_stdout("d1").run();

assert_that(d2_path, existing_file());
assert_that(process(d2_path), execs().with_stdout("d2"));
p.process(d2_path).with_stdout("d2").run();
}

#[test]
Expand Down Expand Up @@ -3696,8 +3686,8 @@ fn run_proper_alias_binary_from_src() {
.build();

p.cargo("build --all").run();
assert_that(process(&p.bin("foo")), execs().with_stdout("foo\n"));
assert_that(process(&p.bin("bar")), execs().with_stdout("bar\n"));
p.process(&p.bin("foo")).with_stdout("foo\n").run();
p.process(&p.bin("bar")).with_stdout("bar\n").run();
}

#[test]
Expand All @@ -3719,8 +3709,8 @@ fn run_proper_alias_binary_main_rs() {
.build();

p.cargo("build --all").run();
assert_that(process(&p.bin("foo")), execs().with_stdout("main\n"));
assert_that(process(&p.bin("bar")), execs().with_stdout("main\n"));
p.process(&p.bin("foo")).with_stdout("main\n").run();
p.process(&p.bin("bar")).with_stdout("main\n").run();
}

#[test]
Expand Down
Loading