Skip to content
Open
Show file tree
Hide file tree
Changes from 10 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
9 changes: 8 additions & 1 deletion crates/forge-runner/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use crate::coverage_api::run_coverage;
use crate::forge_config::{ExecutionDataToSave, ForgeConfig};
use crate::package_tests::TestCase;
use crate::running::{run_fuzz_test, run_test};
use crate::test_case_summary::TestCaseSummary;
use anyhow::Result;
Expand Down Expand Up @@ -56,7 +57,13 @@ const BUILTINS: [&str; 11] = [
];

pub trait TestCaseFilter {
fn should_be_run(&self, test_case: &TestCaseWithResolvedConfig) -> bool;
fn should_be_run<T>(&self, test_case: &TestCase<T>) -> bool
where
T: TestCaseIsIgnored;
}

pub trait TestCaseIsIgnored {
fn is_ignored(&self) -> bool;
}

pub fn maybe_save_trace_and_profile(
Expand Down
11 changes: 10 additions & 1 deletion crates/forge-runner/src/package_tests/with_config.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
use super::{TestCase, TestTarget};
use crate::expected_result::{ExpectedPanicValue, ExpectedTestResult};
use crate::{
TestCaseIsIgnored,
expected_result::{ExpectedPanicValue, ExpectedTestResult},
};
use cheatnet::runtime_extensions::forge_config_extension::config::{
Expected, RawAvailableResourceBoundsConfig, RawForgeConfig, RawForkConfig, RawFuzzerConfig,
RawShouldPanicConfig,
Expand All @@ -22,6 +25,12 @@ pub struct TestCaseConfig {
pub disable_predeployed_contracts: bool,
}

impl TestCaseIsIgnored for TestCaseConfig {
fn is_ignored(&self) -> bool {
self.ignored
}
}

impl From<RawForgeConfig> for TestCaseConfig {
fn from(value: RawForgeConfig) -> Self {
Self {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use super::{TestCase, TestTarget};
use crate::{expected_result::ExpectedTestResult, package_tests::TestDetails};
use crate::{TestCaseIsIgnored, expected_result::ExpectedTestResult, package_tests::TestDetails};
use anyhow::Result;
use cairo_vm::types::program::Program;
use cheatnet::runtime_extensions::forge_config_extension::config::{
Expand Down Expand Up @@ -55,3 +55,9 @@ pub struct TestCaseResolvedConfig {
pub fuzzer_config: Option<RawFuzzerConfig>,
pub disable_predeployed_contracts: bool,
}

impl TestCaseIsIgnored for TestCaseResolvedConfig {
fn is_ignored(&self) -> bool {
self.ignored
}
}
5 changes: 4 additions & 1 deletion crates/forge/src/run_tests/package.rs
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ async fn test_package_with_config_resolved(
fork_targets: &[ForkTarget],
block_number_map: &mut BlockNumberMap,
forge_config: &ForgeConfig,
tests_filter: &TestsFilter,
) -> Result<Vec<TestTargetWithResolvedConfig>> {
let mut test_targets_with_resolved_config = Vec::with_capacity(test_targets.len());

Expand All @@ -146,7 +147,8 @@ async fn test_package_with_config_resolved(
&forge_config.test_runner_config.tracked_resource,
)?;

let test_target = resolve_config(test_target, fork_targets, block_number_map).await?;
let test_target =
resolve_config(test_target, fork_targets, block_number_map, tests_filter).await?;

test_targets_with_resolved_config.push(test_target);
}
Expand Down Expand Up @@ -175,6 +177,7 @@ pub async fn run_for_package(
&fork_targets,
block_number_map,
&forge_config,
&tests_filter,
)
.await?;
let all_tests = sum_test_cases(&test_targets);
Expand Down
Loading
Loading