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 --- .../shirabe/tests/util/http/proxy_manager_test.rs | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'crates/shirabe/tests/util/http') diff --git a/crates/shirabe/tests/util/http/proxy_manager_test.rs b/crates/shirabe/tests/util/http/proxy_manager_test.rs index 50be143..0ed059d 100644 --- a/crates/shirabe/tests/util/http/proxy_manager_test.rs +++ b/crates/shirabe/tests/util/http/proxy_manager_test.rs @@ -2,11 +2,48 @@ // ProxyManager reads HTTP(S)_PROXY / CGI_HTTP_PROXY / no_proxy environment variables; the // env-dependent setup (without its setUp/tearDown isolation) is not ported. +use shirabe::util::http::proxy_manager::ProxyManager; +use shirabe::util::platform::Platform; + +fn set_up() { + Platform::clear_env("HTTP_PROXY"); + Platform::clear_env("http_proxy"); + Platform::clear_env("HTTPS_PROXY"); + Platform::clear_env("https_proxy"); + Platform::clear_env("NO_PROXY"); + Platform::clear_env("no_proxy"); + Platform::clear_env("CGI_HTTP_PROXY"); + Platform::clear_env("cgi_http_proxy"); + ProxyManager::reset(); +} + +fn tear_down() { + Platform::clear_env("HTTP_PROXY"); + Platform::clear_env("http_proxy"); + Platform::clear_env("HTTPS_PROXY"); + Platform::clear_env("https_proxy"); + Platform::clear_env("NO_PROXY"); + Platform::clear_env("no_proxy"); + Platform::clear_env("CGI_HTTP_PROXY"); + Platform::clear_env("cgi_http_proxy"); + ProxyManager::reset(); +} + +struct TearDown; + +impl Drop for TearDown { + fn drop(&mut self) { + tear_down(); + } +} + macro_rules! stub { ($name:ident) => { #[test] #[ignore = "not yet ported (ProxyManager is driven by proxy environment variables)"] fn $name() { + let _tear_down = TearDown; + set_up(); todo!() } }; -- cgit v1.3.1