From 2b2ca914cc5f2f7fde3b6e75faabbe4913fd7264 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 21 Jun 2026 12:40:10 +0900 Subject: test(tests): port setUp/tearDown as set_up/tear_down with TearDown Port PHP setUp/tearDown across the ported integration tests using same-named set_up()/tear_down() functions and a TearDown struct whose Drop runs tear_down(). Fixture-init setUp returns its fixtures; tmpdir-style setUp/tearDown carry state in TearDown fields. Parts that depend on unported infrastructure (PHPUnit mocks, Config::merge, the PHP error handler) stay todo!() and are only wired into ignored stubs to avoid breaking live tests. Also fix shirabe-php-shim putenv to handle the no-'=' form (PHP unsets the variable), which Platform::clear_env relies on for the env-clearing tearDowns. Co-Authored-By: Claude Opus 4.8 --- .../dependency_resolver/rule_set_iterator_test.rs | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'crates/shirabe/tests/dependency_resolver/rule_set_iterator_test.rs') diff --git a/crates/shirabe/tests/dependency_resolver/rule_set_iterator_test.rs b/crates/shirabe/tests/dependency_resolver/rule_set_iterator_test.rs index d654dd7..9bb939b 100644 --- a/crates/shirabe/tests/dependency_resolver/rule_set_iterator_test.rs +++ b/crates/shirabe/tests/dependency_resolver/rule_set_iterator_test.rs @@ -5,6 +5,7 @@ use std::rc::Rc; use indexmap::IndexMap; use shirabe::dependency_resolver::generic_rule::GenericRule; +use shirabe::dependency_resolver::pool::Pool; use shirabe::dependency_resolver::rule::{RULE_LEARNED, RULE_ROOT_REQUIRE, ReasonData, Rule}; use shirabe::dependency_resolver::rule_set::RuleSet; use shirabe::dependency_resolver::rule_set_iterator::RuleSetIterator; @@ -23,8 +24,16 @@ fn root_require_rule() -> Rc> { )))) } -// Mirrors the original setUp(). -fn make_rules() -> Rules { +fn set_up() -> (Pool, Rules) { + let pool = Pool::new( + vec![], + vec![], + IndexMap::new(), + IndexMap::new(), + IndexMap::new(), + IndexMap::new(), + ); + let mut rules: Rules = IndexMap::new(); rules.insert( RuleSet::TYPE_REQUEST, @@ -39,12 +48,13 @@ fn make_rules() -> Rules { ))))], ); rules.insert(RuleSet::TYPE_PACKAGE, vec![]); - rules + + (pool, rules) } #[test] fn test_foreach() { - let rules = make_rules(); + let (_pool, rules) = set_up(); let mut rule_set_iterator = RuleSetIterator::new(rules.clone()); let mut result: Vec>> = Vec::new(); @@ -67,7 +77,7 @@ fn test_foreach() { #[test] fn test_keys() { - let rules = make_rules(); + let (_pool, rules) = set_up(); let mut rule_set_iterator = RuleSetIterator::new(rules); let mut result: Vec = Vec::new(); -- cgit v1.3.1