Simplify tests

[matklad]

@alexcrichton I think there is one bit of tests that could be simplified.

What do you think about writing this

test!(simple {
    pkg("foo", "0.0.1");

    assert_that(cargo_process("install").arg("foo"),
                execs().with_status(0).with_stdout(&format!("\
[UPDATING] registry `[..]`
[DOWNLOADING] foo v0.0.1 (registry file://[..])
[COMPILING] foo v0.0.1 (registry file://[..])
[INSTALLING] {home}[..]bin[..]foo[..]
",
        home = cargo_home().display())));
    assert_that(cargo_home(), has_installed_exe("foo"));

    assert_that(cargo_process("uninstall").arg("foo"),
                execs().with_status(0).with_stdout(&format!("\
[REMOVING] {home}[..]bin[..]foo[..]
",
        home = cargo_home().display())));
    assert_that(cargo_home(), is_not(has_installed_exe("foo")));
});

instead of this

test!(simple {
    pkg("foo", "0.0.1");

    assert_that(cargo_process("install").arg("foo"),
                execs().with_status(0).with_stdout(&format!("\
{updating} registry `[..]`
{downloading} foo v0.0.1 (registry file://[..])
{compiling} foo v0.0.1 (registry file://[..])
{installing} {home}[..]bin[..]foo[..]
",
        updating = UPDATING,
        downloading = DOWNLOADING,
        compiling = COMPILING,
        installing = INSTALLING,
        home = cargo_home().display())));
    assert_that(cargo_home(), has_installed_exe("foo"));

    assert_that(cargo_process("uninstall").arg("foo"),
                execs().with_status(0).with_stdout(&format!("\
{removing} {home}[..]bin[..]foo[..]
",
        removing = REMOVING,
        home = cargo_home().display())));
    assert_that(cargo_home(), is_not(has_installed_exe("foo")));
});

This PR has a proof of concept implementation of this feature applied to a couple of tests.

r? @alexcrichton

[alexcrichton]

Sounds good to me! I like the idea of making these more ergonomic :)

[alexcrichton]

Wanna tackle some more as part of this?

[matklad]

Wanna tackle some more as part of this?

Not sure what did you mean by this :( I want to change all the tests and probably to get rid of those statics and that would be all for this PR. substitute_macros fn does a horrible amount of useless coping, but I it should not matter performance-wise.

[alexcrichton]

Ah yeah that's all I mean, applying this treatment to more tests. And yeah so long as the tests don't take days it's fine by me :)

[matklad]

Ok, I've removed about a third of this formatting constants. I hope to continue this work tomorrow, but it might be a good idea to merge the current work:

• it already saves 250 lines of code
• it will conflict with basically any other change to tests.

[alexcrichton]

I'd be fine with an incremental approach, but looks like tidy is failing?

[matklad]

but looks like tidy is failing?

Ah, I've just cargo tested it locally, without ./test/check-style.sh. Updated the PR.

And indeed I am afraid that I can introduce a bit of bad formatting, because most changes here are done via regex search/replace (no structural search/replace in IntelliJ-Rust yet :( ). But in my opinion these tests are not exactly beautiful anyway :)

[alexcrichton]

@bors: r+ 29cdad4

[bors]

⌛ Testing commit 29cdad4 with merge e3bc030...

[bors]

☀️ Test successful - cargo-cross-linux, cargo-linux-32, cargo-linux-64, cargo-mac-32, cargo-mac-64, cargo-win-gnu-32, cargo-win-gnu-64, cargo-win-msvc-32, cargo-win-msvc-64