test: mark test cases in testsuite locate_project and move on

rust-lang#14091 (comment)

Author: henry40408

tests/testsuite/locate_project.rs

@@ -1,47 +1,38 @@
 //! Tests for the `cargo locate-project` command.
 
-use cargo_test_support::{project, str};
+use cargo_test_support::project;
 
 #[cargo_test]
+#[allow(deprecated)]
 fn simple() {
     let p = project().build();
 
     p.cargo("locate-project")
-        .with_stdout_data(str![[r#"
-{"root":"[..]"}
-
-"#]])
+        .with_json(r#"{"root": "[ROOT]/foo/Cargo.toml"}"#)
         .run();
 }
 
 #[cargo_test]
+#[allow(deprecated)]
 fn message_format() {
     let p = project().build();
 
     p.cargo("locate-project --message-format plain")
-        .with_stdout_data(str![[r#"
-[ROOT]/foo/Cargo.toml
-
-"#]])
+        .with_stdout("[ROOT]/foo/Cargo.toml")
         .run();
 
     p.cargo("locate-project --message-format json")
-        .with_stdout_data(str![[r#"
-{"root":"[..]"}
-
-"#]])
+        .with_json(r#"{"root": "[ROOT]/foo/Cargo.toml"}"#)
         .run();
 
     p.cargo("locate-project --message-format cryptic")
-        .with_stderr_data(str![[r#"
-[ERROR] invalid message format specifier: `cryptic`
-
-"#]])
+        .with_stderr("error: invalid message format specifier: `cryptic`")
         .with_status(101)
         .run();
 }
 
 #[cargo_test]
+#[allow(deprecated)]
 fn workspace() {
     let p = project()
         .file(
@@ -67,33 +58,22 @@ fn workspace() {
         .file("inner/src/lib.rs", "")
         .build();
 
-    p.cargo("locate-project")
-        .with_stdout_data(str![[r#"
-{"root":"[..]"}
+    let outer_manifest = r#"{"root": "[ROOT]/foo/Cargo.toml"}"#;
+    let inner_manifest = r#"{"root": "[ROOT]/foo/inner/Cargo.toml"}"#;
 
-"#]])
-        .run();
+    p.cargo("locate-project").with_json(outer_manifest).run();
 
     p.cargo("locate-project")
         .cwd("inner")
-        .with_stdout_data(str![[r#"
-{"root":"[..]"}
-
-"#]])
+        .with_json(inner_manifest)
         .run();
 
     p.cargo("locate-project --workspace")
-        .with_stdout_data(str![[r#"
-{"root":"[..]"}
-
-"#]])
+        .with_json(outer_manifest)
         .run();
 
     p.cargo("locate-project --workspace")
         .cwd("inner")
-        .with_stdout_data(str![[r#"
-{"root":"[..]"}
-
-"#]])
+        .with_json(outer_manifest)
         .run();
 }