diff options
Diffstat (limited to 'cli/tools/test/reporters')
| -rw-r--r-- | cli/tools/test/reporters/common.rs | 12 | ||||
| -rw-r--r-- | cli/tools/test/reporters/dot.rs | 8 | ||||
| -rw-r--r-- | cli/tools/test/reporters/junit.rs | 25 | ||||
| -rw-r--r-- | cli/tools/test/reporters/pretty.rs | 11 | ||||
| -rw-r--r-- | cli/tools/test/reporters/tap.rs | 15 |
5 files changed, 56 insertions, 15 deletions
diff --git a/cli/tools/test/reporters/common.rs b/cli/tools/test/reporters/common.rs index e4d8d4247..7ca83db80 100644 --- a/cli/tools/test/reporters/common.rs +++ b/cli/tools/test/reporters/common.rs @@ -105,6 +105,7 @@ pub(super) fn report_summary( cwd: &Url, summary: &TestSummary, elapsed: &Duration, + options: &TestFailureFormatOptions, ) { if !summary.failures.is_empty() || !summary.uncaught_errors.is_empty() { #[allow(clippy::type_complexity)] // Type alias doesn't look better here @@ -136,8 +137,13 @@ pub(super) fn report_summary( if !failure.hide_in_summary() { let failure_title = format_test_for_summary(cwd, description); writeln!(writer, "{}", &failure_title).unwrap(); - writeln!(writer, "{}: {}", colors::red_bold("error"), failure) - .unwrap(); + writeln!( + writer, + "{}: {}", + colors::red_bold("error"), + failure.format(options) + ) + .unwrap(); writeln!(writer).unwrap(); failure_titles.push(failure_title); } @@ -152,7 +158,7 @@ pub(super) fn report_summary( writer, "{}: {}", colors::red_bold("error"), - format_test_error(js_error) + format_test_error(js_error, options) ) .unwrap(); writeln!(writer, "This error was not caught from a test and caused the test runner to fail on the referenced module.").unwrap(); diff --git a/cli/tools/test/reporters/dot.rs b/cli/tools/test/reporters/dot.rs index 8fbd59232..169c4b0e7 100644 --- a/cli/tools/test/reporters/dot.rs +++ b/cli/tools/test/reporters/dot.rs @@ -9,11 +9,15 @@ pub struct DotTestReporter { width: usize, cwd: Url, summary: TestSummary, + failure_format_options: TestFailureFormatOptions, } #[allow(clippy::print_stdout)] impl DotTestReporter { - pub fn new(cwd: Url) -> DotTestReporter { + pub fn new( + cwd: Url, + failure_format_options: TestFailureFormatOptions, + ) -> DotTestReporter { let console_width = if let Some(size) = crate::util::console::console_size() { size.cols as usize @@ -26,6 +30,7 @@ impl DotTestReporter { width: console_width, cwd, summary: TestSummary::new(), + failure_format_options, } } @@ -190,6 +195,7 @@ impl TestReporter for DotTestReporter { &self.cwd, &self.summary, elapsed, + &self.failure_format_options, ); println!(); } diff --git a/cli/tools/test/reporters/junit.rs b/cli/tools/test/reporters/junit.rs index 4b69218df..3998bee40 100644 --- a/cli/tools/test/reporters/junit.rs +++ b/cli/tools/test/reporters/junit.rs @@ -15,19 +15,28 @@ pub struct JunitTestReporter { // from child to parent to build the full test name that reflects the test // hierarchy. test_name_tree: TestNameTree, + failure_format_options: TestFailureFormatOptions, } impl JunitTestReporter { - pub fn new(cwd: Url, output_path: String) -> Self { + pub fn new( + cwd: Url, + output_path: String, + failure_format_options: TestFailureFormatOptions, + ) -> Self { Self { cwd, output_path, cases: IndexMap::new(), test_name_tree: TestNameTree::new(), + failure_format_options, } } - fn convert_status(status: &TestResult) -> quick_junit::TestCaseStatus { + fn convert_status( + status: &TestResult, + failure_format_options: &TestFailureFormatOptions, + ) -> quick_junit::TestCaseStatus { match status { TestResult::Ok => quick_junit::TestCaseStatus::success(), TestResult::Ignored => quick_junit::TestCaseStatus::skipped(), @@ -35,7 +44,7 @@ impl JunitTestReporter { kind: quick_junit::NonSuccessKind::Failure, message: Some(failure.overview()), ty: None, - description: Some(failure.detail()), + description: Some(failure.format(failure_format_options).into_owned()), reruns: vec![], }, TestResult::Cancelled => quick_junit::TestCaseStatus::NonSuccess { @@ -50,6 +59,7 @@ impl JunitTestReporter { fn convert_step_status( status: &TestStepResult, + failure_format_options: &TestFailureFormatOptions, ) -> quick_junit::TestCaseStatus { match status { TestStepResult::Ok => quick_junit::TestCaseStatus::success(), @@ -59,7 +69,9 @@ impl JunitTestReporter { kind: quick_junit::NonSuccessKind::Failure, message: Some(failure.overview()), ty: None, - description: Some(failure.detail()), + description: Some( + failure.format(failure_format_options).into_owned(), + ), reruns: vec![], } } @@ -111,7 +123,7 @@ impl TestReporter for JunitTestReporter { elapsed: u64, ) { if let Some(case) = self.cases.get_mut(&description.id) { - case.status = Self::convert_status(result); + case.status = Self::convert_status(result, &self.failure_format_options); case.set_time(Duration::from_millis(elapsed)); } } @@ -153,7 +165,8 @@ impl TestReporter for JunitTestReporter { _test_steps: &IndexMap<usize, TestStepDescription>, ) { if let Some(case) = self.cases.get_mut(&description.id) { - case.status = Self::convert_step_status(result); + case.status = + Self::convert_step_status(result, &self.failure_format_options); case.set_time(Duration::from_millis(elapsed)); } } diff --git a/cli/tools/test/reporters/pretty.rs b/cli/tools/test/reporters/pretty.rs index cb9f2c435..4120bbfb5 100644 --- a/cli/tools/test/reporters/pretty.rs +++ b/cli/tools/test/reporters/pretty.rs @@ -20,6 +20,7 @@ pub struct PrettyTestReporter { HashMap<usize, IndexMap<usize, (TestStepDescription, TestStepResult, u64)>>, summary: TestSummary, writer: Box<dyn std::io::Write>, + failure_format_options: TestFailureFormatOptions, } impl PrettyTestReporter { @@ -29,6 +30,7 @@ impl PrettyTestReporter { filter: bool, repl: bool, cwd: Url, + failure_format_options: TestFailureFormatOptions, ) -> PrettyTestReporter { PrettyTestReporter { parallel, @@ -45,6 +47,7 @@ impl PrettyTestReporter { child_results_buffer: Default::default(), summary: TestSummary::new(), writer: Box::new(std::io::stdout()), + failure_format_options, } } @@ -395,7 +398,13 @@ impl TestReporter for PrettyTestReporter { _test_steps: &IndexMap<usize, TestStepDescription>, ) { self.write_output_end(); - common::report_summary(&mut self.writer, &self.cwd, &self.summary, elapsed); + common::report_summary( + &mut self.writer, + &self.cwd, + &self.summary, + elapsed, + &self.failure_format_options, + ); if !self.repl { writeln!(&mut self.writer).unwrap(); } diff --git a/cli/tools/test/reporters/tap.rs b/cli/tools/test/reporters/tap.rs index 62cb58a83..ea68ddd43 100644 --- a/cli/tools/test/reporters/tap.rs +++ b/cli/tools/test/reporters/tap.rs @@ -20,11 +20,16 @@ pub struct TapTestReporter { n: usize, step_n: usize, step_results: HashMap<usize, Vec<(TestStepDescription, TestStepResult)>>, + failure_format_options: TestFailureFormatOptions, } #[allow(clippy::print_stdout)] impl TapTestReporter { - pub fn new(cwd: Url, is_concurrent: bool) -> TapTestReporter { + pub fn new( + cwd: Url, + is_concurrent: bool, + failure_format_options: TestFailureFormatOptions, + ) -> TapTestReporter { TapTestReporter { cwd, is_concurrent, @@ -33,6 +38,7 @@ impl TapTestReporter { n: 0, step_n: 0, step_results: HashMap::new(), + failure_format_options, } } @@ -45,6 +51,7 @@ impl TapTestReporter { } fn print_diagnostic( + &self, indent: usize, failure: &TestFailure, location: DiagnosticLocation, @@ -56,7 +63,7 @@ impl TapTestReporter { // YAML is a superset of JSON, so we can avoid a YAML dependency here. // This makes the output less readable though. let diagnostic = serde_json::to_string(&json!({ - "message": failure.to_string(), + "message": failure.format(&self.failure_format_options), "severity": "fail".to_string(), "at": location, })) @@ -102,7 +109,7 @@ impl TapTestReporter { Self::print_line(4, status, self.step_n, &desc.name, directive); if let TestStepResult::Failed(failure) = result { - Self::print_diagnostic( + self.print_diagnostic( 4, failure, DiagnosticLocation { @@ -171,7 +178,7 @@ impl TestReporter for TapTestReporter { Self::print_line(0, status, self.n, &description.name, directive); if let TestResult::Failed(failure) = result { - Self::print_diagnostic( + self.print_diagnostic( 0, failure, DiagnosticLocation { |