From 142be920279e030c7f056ddf210a9be7964a3136 Mon Sep 17 00:00:00 2001 From: Fiiranek Date: Wed, 5 Nov 2025 18:36:59 +0100 Subject: [PATCH 1/3] Rename `OverallSummaryMessage` -> `WorkspaceSummaryMessage` --- crates/forge/src/run_tests/messages/mod.rs | 2 +- .../messages/{overall_summary.rs => workspace_summary.rs} | 6 +++--- crates/forge/src/run_tests/workspace.rs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename crates/forge/src/run_tests/messages/{overall_summary.rs => workspace_summary.rs} (87%) diff --git a/crates/forge/src/run_tests/messages/mod.rs b/crates/forge/src/run_tests/messages/mod.rs index 9d28624e83..9f091cb4e1 100644 --- a/crates/forge/src/run_tests/messages/mod.rs +++ b/crates/forge/src/run_tests/messages/mod.rs @@ -1,6 +1,6 @@ pub mod collected_tests_count; pub mod latest_blocks_numbers; -pub mod overall_summary; pub mod tests_failure_summary; pub mod tests_run; pub mod tests_summary; +pub mod workspace_summary; diff --git a/crates/forge/src/run_tests/messages/overall_summary.rs b/crates/forge/src/run_tests/messages/workspace_summary.rs similarity index 87% rename from crates/forge/src/run_tests/messages/overall_summary.rs rename to crates/forge/src/run_tests/messages/workspace_summary.rs index ef554701e9..6829515f3b 100644 --- a/crates/forge/src/run_tests/messages/overall_summary.rs +++ b/crates/forge/src/run_tests/messages/workspace_summary.rs @@ -6,11 +6,11 @@ use serde::Serialize; use serde_json::{Value, json}; #[derive(Serialize)] -pub struct OverallSummaryMessage { +pub struct WorkspaceSummaryMessage { summary: TestsSummary, } -impl OverallSummaryMessage { +impl WorkspaceSummaryMessage { pub const LABEL: &str = "Tests summary"; #[must_use] @@ -21,7 +21,7 @@ impl OverallSummaryMessage { } } -impl Message for OverallSummaryMessage { +impl Message for WorkspaceSummaryMessage { fn text(&self) -> String { let styled_label = style(&Self::LABEL).bold().to_string(); LabeledMessage::new(&styled_label, &self.summary.format_summary_message()).text() diff --git a/crates/forge/src/run_tests/workspace.rs b/crates/forge/src/run_tests/workspace.rs index 95955b3461..fee6f6303a 100644 --- a/crates/forge/src/run_tests/workspace.rs +++ b/crates/forge/src/run_tests/workspace.rs @@ -1,7 +1,7 @@ use super::package::RunForPackageArgs; use crate::run_tests::messages::latest_blocks_numbers::LatestBlocksNumbersMessage; -use crate::run_tests::messages::overall_summary::OverallSummaryMessage; use crate::run_tests::messages::tests_failure_summary::TestsFailureSummaryMessage; +use crate::run_tests::messages::workspace_summary::WorkspaceSummaryMessage; use crate::{ ExitStatus, TestArgs, block_number_map::BlockNumberMap, run_tests::package::run_for_package, scarb::build_artifacts_with_scarb, shared_cache::FailedTestsCache, @@ -97,7 +97,7 @@ pub async fn run_for_workspace( .map(|(total, filtered)| total + filtered); } - let overall_summary = OverallSummaryMessage::new(&all_tests, total_filtered_count); + let overall_summary = WorkspaceSummaryMessage::new(&all_tests, total_filtered_count); let all_failed_tests: Vec = extract_failed_tests(all_tests).collect(); FailedTestsCache::new(&workspace_dirs.cache_dir).save_failed_tests(&all_failed_tests)?; From 9c86db7546a47126cd36fd725f40ae658ee8428a Mon Sep 17 00:00:00 2001 From: Fiiranek Date: Thu, 6 Nov 2025 08:39:17 +0100 Subject: [PATCH 2/3] Rename variable --- crates/forge/src/run_tests/workspace.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/forge/src/run_tests/workspace.rs b/crates/forge/src/run_tests/workspace.rs index fee6f6303a..5454effe40 100644 --- a/crates/forge/src/run_tests/workspace.rs +++ b/crates/forge/src/run_tests/workspace.rs @@ -97,7 +97,7 @@ pub async fn run_for_workspace( .map(|(total, filtered)| total + filtered); } - let overall_summary = WorkspaceSummaryMessage::new(&all_tests, total_filtered_count); + let workspace_summary = WorkspaceSummaryMessage::new(&all_tests, total_filtered_count); let all_failed_tests: Vec = extract_failed_tests(all_tests).collect(); FailedTestsCache::new(&workspace_dirs.cache_dir).save_failed_tests(&all_failed_tests)?; @@ -114,7 +114,7 @@ pub async fn run_for_workspace( if packages_len > 1 { // Add newline to separate summary from previous output ui.print_blank_line(); - ui.println(&overall_summary); + ui.println(&workspace_summary); } if args.exact { From c71946cb82341c7de52f918d2ed1fc2dbcc7bccd Mon Sep 17 00:00:00 2001 From: Fiiranek Date: Thu, 6 Nov 2025 19:33:27 +0100 Subject: [PATCH 3/3] Move printing test target collection message --- crates/forge/src/run_tests/package.rs | 8 +------- crates/forge/src/run_tests/test_target.rs | 7 +++++++ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/crates/forge/src/run_tests/package.rs b/crates/forge/src/run_tests/package.rs index 3304c49f9e..e5331a79ca 100644 --- a/crates/forge/src/run_tests/package.rs +++ b/crates/forge/src/run_tests/package.rs @@ -9,8 +9,7 @@ use crate::{ combine_configs::combine_configs, run_tests::{ messages::{ - collected_tests_count::CollectedTestsCountMessage, tests_run::TestsRunMessage, - tests_summary::TestsSummaryMessage, + collected_tests_count::CollectedTestsCountMessage, tests_summary::TestsSummaryMessage, }, workspace::WorkspaceDirs, }, @@ -200,11 +199,6 @@ pub async fn run_for_package( for test_target in test_targets { let ui = ui.clone(); - ui.println(&TestsRunMessage::new( - test_target.tests_location, - test_target.test_cases.len(), - )); - let summary = run_for_test_target(test_target, forge_config.clone(), &tests_filter, ui).await?; diff --git a/crates/forge/src/run_tests/test_target.rs b/crates/forge/src/run_tests/test_target.rs index e03e6d874e..085fd76873 100644 --- a/crates/forge/src/run_tests/test_target.rs +++ b/crates/forge/src/run_tests/test_target.rs @@ -14,6 +14,8 @@ use futures::{StreamExt, stream::FuturesUnordered}; use std::sync::Arc; use tokio::sync::mpsc::channel; +use crate::run_tests::messages::tests_run::TestsRunMessage; + #[non_exhaustive] pub enum TestTargetRunResult { Ok(TestTargetSummary), @@ -27,6 +29,11 @@ pub async fn run_for_test_target( tests_filter: &impl TestCaseFilter, ui: Arc, ) -> Result { + ui.println(&TestsRunMessage::new( + tests.tests_location, + tests.test_cases.len(), + )); + let casm_program = tests.casm_program.clone(); let mut tasks = FuturesUnordered::new();