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 --- .../archiver/archivable_files_finder_test.rs | 24 +++++++++++++++++++++ .../tests/package/archiver/archive_manager_test.rs | 25 ++++++++++++++++++++++ .../tests/package/archiver/zip_archiver_test.rs | 25 ++++++++++++++++++++++ 3 files changed, 74 insertions(+) (limited to 'crates/shirabe/tests/package/archiver') diff --git a/crates/shirabe/tests/package/archiver/archivable_files_finder_test.rs b/crates/shirabe/tests/package/archiver/archivable_files_finder_test.rs index 381c032..dcca80a 100644 --- a/crates/shirabe/tests/package/archiver/archivable_files_finder_test.rs +++ b/crates/shirabe/tests/package/archiver/archivable_files_finder_test.rs @@ -1,5 +1,29 @@ //! ref: composer/tests/Composer/Test/Package/Archiver/ArchivableFilesFinderTest.php +/// Builds a temp directory tree of fixture files under a unique tmp dir; the Filesystem and +/// getUniqueTmpDirectory infrastructure is not ported. +#[allow(dead_code)] +fn set_up() -> String { + todo!() +} + +#[allow(dead_code)] +fn tear_down(_sources: &str) { + // Removes the temp directory tree created in set_up. + todo!() +} + +#[allow(dead_code)] +struct TearDown { + sources: String, +} + +impl Drop for TearDown { + fn drop(&mut self) { + tear_down(&self.sources); + } +} + // These set up a temp directory tree (including a git repo) and assert the files the finder // selects with manual/git/skip excludes; the git-backed fixture setup is not ported. macro_rules! stub { diff --git a/crates/shirabe/tests/package/archiver/archive_manager_test.rs b/crates/shirabe/tests/package/archiver/archive_manager_test.rs index 5f9e413..912512d 100644 --- a/crates/shirabe/tests/package/archiver/archive_manager_test.rs +++ b/crates/shirabe/tests/package/archiver/archive_manager_test.rs @@ -1,5 +1,30 @@ //! ref: composer/tests/Composer/Test/Package/Archiver/ArchiveManagerTest.php +/// Builds an ArchiveManager via Factory/DownloadManager/Loop and derives targetDir under a +/// unique tmp dir (testDir); none of that factory/fixture infrastructure is ported. +/// Returns (test_dir, target_dir). +#[allow(dead_code)] +fn set_up() -> (String, String) { + todo!() +} + +#[allow(dead_code)] +fn tear_down(_test_dir: &str) { + // Removes testDir created in set_up. + todo!() +} + +#[allow(dead_code)] +struct TearDown { + test_dir: String, +} + +impl Drop for TearDown { + fn drop(&mut self) { + tear_down(&self.test_dir); + } +} + // These drive ArchiveManager end-to-end (building tar archives via PharData, todo!()) and // the filename-derivation helpers over packages; the archiving and fixture setup are not // ported. diff --git a/crates/shirabe/tests/package/archiver/zip_archiver_test.rs b/crates/shirabe/tests/package/archiver/zip_archiver_test.rs index 1c884d8..5f41c78 100644 --- a/crates/shirabe/tests/package/archiver/zip_archiver_test.rs +++ b/crates/shirabe/tests/package/archiver/zip_archiver_test.rs @@ -1,5 +1,30 @@ //! ref: composer/tests/Composer/Test/Package/Archiver/ZipArchiverTest.php +/// Creates the Filesystem/ProcessExecutor and a unique tmp testDir; that infrastructure is +/// not ported. Returns testDir. +#[allow(dead_code)] +fn set_up() -> String { + todo!() +} + +/// Unlinks the zip files collected in filesToCleanup, then (parent) removes testDir. +#[allow(dead_code)] +fn tear_down(_files_to_cleanup: &[String], _test_dir: &str) { + todo!() +} + +#[allow(dead_code)] +struct TearDown { + files_to_cleanup: Vec, + test_dir: String, +} + +impl Drop for TearDown { + fn drop(&mut self) { + tear_down(&self.files_to_cleanup, &self.test_dir); + } +} + // ZipArchiver::archive builds a zip via ZipArchive, which is todo!() in the php-shim. #[test] -- cgit v1.3.1