Skip to content

Commit 6d68563

Browse files
borsbors
committed
Auto merge of #14180 - eth3lbert:snapbox-rrtw, r=epage
test: migrate serveral files to snapbox ### What does this PR try to resolve? Part of #14039. Migrate following to snapbox: - `tests/testsuite/read_manifest.rs` - `tests/testsuite/rustdoc_extern_html.rs` - `tests/testsuite/tool_paths.rs` - `tests/testsuite/warn_on_failure.rs`
2 parents d80de66 + b11e741 commit 6d68563

File tree

4 files changed

+275
-220
lines changed

4 files changed

+275
-220
lines changed

‎tests/testsuite/read_manifest.rs

+100-72
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,7 @@
11
//! Tests for the `cargo read-manifest` command.
22
3-
#![allow(deprecated)]
4-
5-
use cargo_test_support::{basic_bin_manifest, main_file, project};
6-
7-
fn manifest_output(readme_value: &str) -> String {
8-
format!(
9-
r#"
10-
{{
11-
"authors": [
12-
"[email protected]"
13-
],
14-
"categories": [],
15-
"default_run": null,
16-
"name":"foo",
17-
"readme": {},
18-
"homepage": null,
19-
"documentation": null,
20-
"repository": null,
21-
"rust_version": null,
22-
"version":"0.5.0",
23-
"id":"path+file://[..]/foo#0.5.0",
24-
"keywords": [],
25-
"license": null,
26-
"license_file": null,
27-
"links": null,
28-
"description": null,
29-
"edition": "2015",
30-
"source":null,
31-
"dependencies":[],
32-
"targets":[{{
33-
"kind":["bin"],
34-
"crate_types":["bin"],
35-
"doc": true,
36-
"doctest": false,
37-
"test": true,
38-
"edition": "2015",
39-
"name":"foo",
40-
"src_path":"[..]/foo/src/foo.rs"
41-
}}],
42-
"features":{{}},
43-
"manifest_path":"[..]Cargo.toml",
44-
"metadata": null,
45-
"publish": null
46-
}}"#,
47-
readme_value
48-
)
49-
}
50-
51-
fn manifest_output_no_readme() -> String {
52-
manifest_output("null")
53-
}
3+
use cargo_test_support::prelude::*;
4+
use cargo_test_support::{basic_bin_manifest, main_file, project, str};
545

556
pub fn basic_bin_manifest_with_readme(name: &str, readme_filename: &str) -> String {
567
format!(
@@ -79,7 +30,15 @@ fn cargo_read_manifest_path_to_cargo_toml_relative() {
7930

8031
p.cargo("read-manifest --manifest-path foo/Cargo.toml")
8132
.cwd(p.root().parent().unwrap())
82-
.with_json(&manifest_output_no_readme())
33+
.with_stdout_data(
34+
str![[r#"
35+
{
36+
"readme": null,
37+
"...": "{...}"
38+
}
39+
"#]]
40+
.json(),
41+
)
8342
.run();
8443
}
8544

@@ -93,7 +52,15 @@ fn cargo_read_manifest_path_to_cargo_toml_absolute() {
9352
p.cargo("read-manifest --manifest-path")
9453
.arg(p.root().join("Cargo.toml"))
9554
.cwd(p.root().parent().unwrap())
96-
.with_json(&manifest_output_no_readme())
55+
.with_stdout_data(
56+
str![[r#"
57+
{
58+
"readme": null,
59+
"...": "{...}"
60+
}
61+
"#]]
62+
.json(),
63+
)
9764
.run();
9865
}
9966

@@ -107,10 +74,10 @@ fn cargo_read_manifest_path_to_cargo_toml_parent_relative() {
10774
p.cargo("read-manifest --manifest-path foo")
10875
.cwd(p.root().parent().unwrap())
10976
.with_status(101)
110-
.with_stderr(
111-
"[ERROR] the manifest-path must be \
112-
a path to a Cargo.toml file",
113-
)
77+
.with_stderr_data(str![[r#"
78+
[ERROR] the manifest-path must be a path to a Cargo.toml file
79+
80+
"#]])
11481
.run();
11582
}
11683

@@ -125,10 +92,10 @@ fn cargo_read_manifest_path_to_cargo_toml_parent_absolute() {
12592
.arg(p.root())
12693
.cwd(p.root().parent().unwrap())
12794
.with_status(101)
128-
.with_stderr(
129-
"[ERROR] the manifest-path must be \
130-
a path to a Cargo.toml file",
131-
)
95+
.with_stderr_data(str![[r#"
96+
[ERROR] the manifest-path must be a path to a Cargo.toml file
97+
98+
"#]])
13299
.run();
133100
}
134101

@@ -140,7 +107,15 @@ fn cargo_read_manifest_cwd() {
140107
.build();
141108

142109
p.cargo("read-manifest")
143-
.with_json(&manifest_output_no_readme())
110+
.with_stdout_data(
111+
str![[r#"
112+
{
113+
"readme": null,
114+
"...": "{...}"
115+
}
116+
"#]]
117+
.json(),
118+
)
144119
.run();
145120
}
146121

@@ -156,25 +131,62 @@ fn cargo_read_manifest_with_specified_readme() {
156131
.build();
157132

158133
p.cargo("read-manifest")
159-
.with_json(&manifest_output(&format!(r#""{}""#, "SomeReadme.txt")))
134+
.with_stdout_data(
135+
str![[r#"
136+
{
137+
"readme": "SomeReadme.txt",
138+
"...": "{...}"
139+
}
140+
"#]]
141+
.json(),
142+
)
160143
.run();
161144
}
162145

163146
#[cargo_test]
164147
fn cargo_read_manifest_default_readme() {
165-
let readme_filenames = ["README.md", "README.txt", "README"];
166-
167-
for readme in readme_filenames.iter() {
148+
let assert_output = |readme, expected| {
168149
let p = project()
169150
.file("Cargo.toml", &basic_bin_manifest("foo"))
170151
.file(readme, "Sample project")
171152
.file("src/foo.rs", &main_file(r#""i am foo""#, &[]))
172153
.build();
173154

174-
p.cargo("read-manifest")
175-
.with_json(&manifest_output(&format!(r#""{}""#, readme)))
176-
.run();
177-
}
155+
p.cargo("read-manifest").with_stdout_data(expected).run();
156+
};
157+
158+
assert_output(
159+
"README.md",
160+
str![[r#"
161+
{
162+
"readme": "README.md",
163+
"...": "{...}"
164+
}
165+
"#]]
166+
.json(),
167+
);
168+
169+
assert_output(
170+
"README.txt",
171+
str![[r#"
172+
{
173+
"readme": "README.txt",
174+
"...": "{...}"
175+
}
176+
"#]]
177+
.json(),
178+
);
179+
180+
assert_output(
181+
"README",
182+
str![[r#"
183+
{
184+
"readme": "README",
185+
"...": "{...}"
186+
}
187+
"#]]
188+
.json(),
189+
);
178190
}
179191

180192
#[cargo_test]
@@ -189,7 +201,15 @@ fn cargo_read_manifest_suppress_default_readme() {
189201
.build();
190202

191203
p.cargo("read-manifest")
192-
.with_json(&manifest_output_no_readme())
204+
.with_stdout_data(
205+
str![[r#"
206+
{
207+
"readme": null,
208+
"...": "{...}"
209+
}
210+
"#]]
211+
.json(),
212+
)
193213
.run();
194214
}
195215

@@ -203,6 +223,14 @@ fn cargo_read_manifest_defaults_readme_if_true() {
203223
.build();
204224

205225
p.cargo("read-manifest")
206-
.with_json(&manifest_output(r#""README.md""#))
226+
.with_stdout_data(
227+
str![[r#"
228+
{
229+
"readme": "README.md",
230+
"...": "{...}"
231+
}
232+
"#]]
233+
.json(),
234+
)
207235
.run();
208236
}

0 commit comments

Comments
 (0)