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 --- crates/shirabe/tests/factory_test.rs | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) (limited to 'crates/shirabe/tests/factory_test.rs') diff --git a/crates/shirabe/tests/factory_test.rs b/crates/shirabe/tests/factory_test.rs index b927d61..cfbbaee 100644 --- a/crates/shirabe/tests/factory_test.rs +++ b/crates/shirabe/tests/factory_test.rs @@ -3,21 +3,39 @@ use shirabe::factory::Factory; use shirabe::util::platform::Platform; +fn tear_down() { + Platform::clear_env("COMPOSER"); +} + +struct TearDown; + +impl Drop for TearDown { + fn drop(&mut self) { + tear_down(); + } +} + #[test] #[ignore = "mocks an IOInterface with a writeError expectation and a Config returning disable-tls=true; mocking is not available"] fn test_default_values_are_as_expected() { + let _tear_down = TearDown; + todo!() } #[test] -#[ignore = "depends on COMPOSER being unset, but sibling tests set it and the tearDown that clears it is not ported"] +#[ignore = "depends on COMPOSER being unset, but sibling tests set it and race it on the process-global env under parallel execution"] fn test_get_composer_json_path() { + let _tear_down = TearDown; + assert_eq!("./composer.json", Factory::get_composer_file().unwrap()); } #[test] -#[ignore = "mutates the global COMPOSER env and races the from_env case in parallel; the tearDown that clears it is not ported"] +#[ignore = "mutates the global COMPOSER env and races the from_env case under parallel execution"] fn test_get_composer_json_path_fails_if_dir() { + let _tear_down = TearDown; + let dir = env!("CARGO_MANIFEST_DIR"); Platform::put_env("COMPOSER", dir); let err = Factory::get_composer_file().unwrap_err(); @@ -32,6 +50,8 @@ fn test_get_composer_json_path_fails_if_dir() { #[test] fn test_get_composer_json_path_from_env() { + let _tear_down = TearDown; + Platform::put_env("COMPOSER", " foo.json "); assert_eq!("foo.json", Factory::get_composer_file().unwrap()); } -- cgit v1.3.1