tests: Use CLI test helper from test-helper repository

taiki-e · Jan 30, 2025 · 8af75b8 · 8af75b8
1 parent 5f48404
commit 8af75b8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 56 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -39,6 +39,7 @@ build-context = "0.1"
 easy-ext = "1"
 fs-err = "3"
 tempfile = { version = "3", default-features = false }
+test-helper = { features = ["cli"], git = "https://github.com/taiki-e/test-helper.git", branch = "main" }
 
 [lints]
 workspace = true

diff --git a/tests/auxiliary/mod.rs b/tests/auxiliary/mod.rs
@@ -4,7 +4,7 @@ use std::{
     env,
     ffi::OsStr,
     path::{Path, PathBuf},
-    process::{Command, ExitStatus},
+    process::Command,
     str,
     sync::LazyLock,
 };
@@ -76,7 +76,7 @@ impl Command {
         let (_test_project, cur_dir) = test_project(test_model);
         let output =
             self.current_dir(cur_dir).output().context("could not execute process").unwrap();
-        AssertOutput(Some(AssertOutputInner {
+        AssertOutput(Some(test_helper::cli::AssertOutput {
             stdout: String::from_utf8_lossy(&output.stdout).into_owned(),
             stderr: String::from_utf8_lossy(&output.stderr)
                 .lines()
@@ -141,13 +141,7 @@ impl Command {
     }
 }
 
-pub(crate) struct AssertOutput(Option<AssertOutputInner>);
-
-struct AssertOutputInner {
-    stdout: String,
-    stderr: String,
-    status: ExitStatus,
-}
+pub(crate) struct AssertOutput(Option<test_helper::cli::AssertOutput>);
 
 fn replace_command(lines: &str) -> String {
     if lines.contains("rustup run") {
@@ -158,75 +152,38 @@ fn replace_command(lines: &str) -> String {
         lines.to_owned()
     }
 }
-fn line_separated(lines: &str) -> impl Iterator<Item = &'_ str> {
-    lines.lines().map(str::trim).filter(|line| !line.is_empty())
-}
 
 impl AssertOutput {
-    /// Receives a line(`\n`)-separated list of patterns and asserts whether stderr contains each pattern.
+    /// Receives a line(`\n`)-separated list of patterns and asserts whether stdout contains each pattern.
     #[track_caller]
-    pub(crate) fn stderr_contains(&self, pats: impl AsRef<str>) -> &Self {
+    pub(crate) fn stdout_contains(&self, pats: impl AsRef<str>) -> &Self {
         if let Some(output) = &self.0 {
-            for pat in line_separated(&replace_command(pats.as_ref())) {
-                if !output.stderr.contains(pat) {
-                    panic!(
-                        "assertion failed: `self.stderr.contains(..)`:\n\nEXPECTED:\n{0}\n{pat}\n{0}\n\nACTUAL:\n{0}\n{1}\n{0}\n",
-                        "-".repeat(60),
-                        output.stderr
-                    );
-                }
-            }
+            output.stdout_contains(replace_command(pats.as_ref()));
         }
         self
     }
-
     /// Receives a line(`\n`)-separated list of patterns and asserts whether stdout contains each pattern.
     #[track_caller]
-    pub(crate) fn stderr_not_contains(&self, pats: impl AsRef<str>) -> &Self {
+    pub(crate) fn stdout_not_contains(&self, pats: impl AsRef<str>) -> &Self {
         if let Some(output) = &self.0 {
-            for pat in line_separated(&replace_command(pats.as_ref())) {
-                if output.stderr.contains(pat) {
-                    panic!(
-                        "assertion failed: `!self.stderr.contains(..)`:\n\nEXPECTED:\n{0}\n{pat}\n{0}\n\nACTUAL:\n{0}\n{1}\n{0}\n",
-                        "-".repeat(60),
-                        output.stderr
-                    );
-                }
-            }
+            output.stdout_not_contains(replace_command(pats.as_ref()));
         }
         self
     }
 
-    /// Receives a line(`\n`)-separated list of patterns and asserts whether stdout contains each pattern.
+    /// Receives a line(`\n`)-separated list of patterns and asserts whether stderr contains each pattern.
     #[track_caller]
-    pub(crate) fn stdout_contains(&self, pats: impl AsRef<str>) -> &Self {
+    pub(crate) fn stderr_contains(&self, pats: impl AsRef<str>) -> &Self {
         if let Some(output) = &self.0 {
-            for pat in line_separated(&replace_command(pats.as_ref())) {
-                if !output.stdout.contains(pat) {
-                    panic!(
-                        "assertion failed: `self.stdout.contains(..)`:\n\nEXPECTED:\n{0}\n{pat}\n{0}\n\nACTUAL:\n{0}\n{1}\n{0}\n",
-                        "-".repeat(60),
-                        output.stdout
-                    );
-                }
-            }
+            output.stderr_contains(replace_command(pats.as_ref()));
         }
         self
     }
-
     /// Receives a line(`\n`)-separated list of patterns and asserts whether stdout contains each pattern.
     #[track_caller]
-    pub(crate) fn stdout_not_contains(&self, pats: impl AsRef<str>) -> &Self {
+    pub(crate) fn stderr_not_contains(&self, pats: impl AsRef<str>) -> &Self {
         if let Some(output) = &self.0 {
-            for pat in line_separated(&replace_command(pats.as_ref())) {
-                if output.stdout.contains(pat) {
-                    panic!(
-                        "assertion failed: `!self.stdout.contains(..)`:\n\nEXPECTED:\n{0}\n{pat}\n{0}\n\nACTUAL:\n{0}\n{1}\n{0}\n",
-                        "-".repeat(60),
-                        output.stdout
-                    );
-                }
-            }
+            output.stderr_not_contains(replace_command(pats.as_ref()));
         }
         self
     }