Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/forge/src/run_tests/messages/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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()
Expand Down
8 changes: 1 addition & 7 deletions crates/forge/src/run_tests/package.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
Expand Down Expand Up @@ -201,11 +200,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?;

Expand Down
7 changes: 7 additions & 0 deletions crates/forge/src/run_tests/test_target.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -27,6 +29,11 @@ pub async fn run_for_test_target(
tests_filter: &impl TestCaseFilter,
ui: Arc<UI>,
) -> Result<TestTargetRunResult> {
ui.println(&TestsRunMessage::new(
tests.tests_location,
tests.test_cases.len(),
));

let casm_program = tests.casm_program.clone();

let mut tasks = FuturesUnordered::new();
Expand Down
6 changes: 3 additions & 3 deletions crates/forge/src/run_tests/workspace.rs
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -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 workspace_summary = WorkspaceSummaryMessage::new(&all_tests, total_filtered_count);
let all_failed_tests: Vec<AnyTestCaseSummary> = extract_failed_tests(all_tests).collect();

FailedTestsCache::new(&workspace_dirs.cache_dir).save_failed_tests(&all_failed_tests)?;
Expand All @@ -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 {
Expand Down
Loading