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 --- .../tests/repository/vcs/git_driver_test.rs | 65 ++++++++++++++++++++++ 1 file changed, 65 insertions(+) (limited to 'crates/shirabe/tests/repository/vcs/git_driver_test.rs') diff --git a/crates/shirabe/tests/repository/vcs/git_driver_test.rs b/crates/shirabe/tests/repository/vcs/git_driver_test.rs index 85c9f0b..c36470c 100644 --- a/crates/shirabe/tests/repository/vcs/git_driver_test.rs +++ b/crates/shirabe/tests/repository/vcs/git_driver_test.rs @@ -4,11 +4,76 @@ // that reaches curl_multi_init, todo!()) to feed git command output; mocking is not // available here. +use indexmap::IndexMap; +use shirabe::config::Config; +use shirabe::util::filesystem::Filesystem; +use shirabe::util::platform::Platform; +use shirabe_php_shim::PhpMixed; +use tempfile::TempDir; + +struct SetUp { + home: TempDir, + config: Config, + network_env: Option, +} + +fn set_up() -> SetUp { + let home = TempDir::new().unwrap(); + let mut config = Config::new(true, None); + let mut top: IndexMap = IndexMap::new(); + let mut config_section: IndexMap = IndexMap::new(); + config_section.insert( + "home".to_string(), + PhpMixed::String(home.path().to_string_lossy().into_owned()), + ); + top.insert("config".to_string(), PhpMixed::Array(config_section)); + config.merge(&top, Config::SOURCE_UNKNOWN); + let network_env = Platform::get_env("COMPOSER_DISABLE_NETWORK"); + + SetUp { + home, + config, + network_env, + } +} + +fn tear_down(home: &std::path::Path, network_env: &Option) { + let mut fs = Filesystem::new(None); + fs.remove_directory(home).unwrap(); + match network_env { + None => Platform::clear_env("COMPOSER_DISABLE_NETWORK"), + Some(network_env) => Platform::put_env("COMPOSER_DISABLE_NETWORK", network_env), + } +} + +struct TearDown { + home: std::path::PathBuf, + network_env: Option, +} + +impl TearDown { + fn new(home: std::path::PathBuf, network_env: Option) -> Self { + TearDown { home, network_env } + } +} + +impl Drop for TearDown { + fn drop(&mut self) { + tear_down(&self.home, &self.network_env); + } +} + macro_rules! git_stub { ($name:ident) => { #[test] #[ignore = "constructs a GitDriver and mocks a ProcessExecutor/HttpDownloader (curl_multi_init todo!())"] fn $name() { + let SetUp { + home, + config: _, + network_env, + } = set_up(); + let _tear_down = TearDown::new(home.path().to_path_buf(), network_env); todo!() } }; -- cgit v1.3.1