From e98823e599eb375b30037cc714710e3309d927d1 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sat, 27 Jun 2026 17:21:00 +0900 Subject: test: port Composer tests unblocked by mockall, add seams Port 11 categories of previously-ignored Composer tests now reachable with the mockall crate: DownloadManager, VCS/Perforce/File downloaders, VersionSelector, PlatformRepository, Auditor, installer/FilesystemRepository, RootPackageLoader, util auth/http, commands, and Cache. Extract test seams additively on concrete structs as *Interface traits (Runtime, HhvmDetector, VersionGuesser, RepositorySet, Perforce, BinaryInstaller) plus mock-field seams (Cache, Filesystem); consumers take trait objects. Mocks are defined locally in the test crates via mockall::mock!, since automock-generated mocks are cfg(test)-gated and invisible across the integration-test boundary. dataProviders are ported in full; tests blocked by unported shims stay #[ignore] with documented reasons rather than reduced or weakened. Fix product bugs surfaced by the ports: - util/github: use the exception code, not the HTTP status, for 401/403 - advisory: serialize empty audit maps as [] to match PHP json_encode - repository/filesystem and downloader/file: fix RefCell double-borrow panics Co-Authored-By: Claude Opus 4.8 (1M context) --- .../shirabe/src/package/version/version_guesser.rs | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'crates/shirabe/src/package/version/version_guesser.rs') diff --git a/crates/shirabe/src/package/version/version_guesser.rs b/crates/shirabe/src/package/version/version_guesser.rs index c5bf4c2..6642201 100644 --- a/crates/shirabe/src/package/version/version_guesser.rs +++ b/crates/shirabe/src/package/version/version_guesser.rs @@ -20,6 +20,19 @@ use crate::util::Platform; use crate::util::ProcessExecutor; use crate::util::Svn as SvnUtil; +/// Seam over the parts of [`VersionGuesser`] that consumers depend on, so they can be exercised +/// with a test double. PHP has no such interface; this exists only to allow mocking the concrete +/// `VersionGuesser` (a Phase C seam). +pub trait VersionGuesserInterface: std::fmt::Debug { + fn guess_version( + &mut self, + package_config: &IndexMap, + path: &str, + ) -> Result>; + + fn get_root_version_from_env(&self) -> Result; +} + /// Try to guess the current version number based on different VCS configuration. /// /// @phpstan-type Version array{version: string, commit: string|null, pretty_version: string|null}|array{version: string, commit: string|null, pretty_version: string|null, feature_version: string|null, feature_pretty_version: string|null} @@ -747,6 +760,20 @@ impl VersionGuesser { } } +impl VersionGuesserInterface for VersionGuesser { + fn guess_version( + &mut self, + package_config: &IndexMap, + path: &str, + ) -> Result> { + VersionGuesser::guess_version(self, package_config, path) + } + + fn get_root_version_from_env(&self) -> Result { + VersionGuesser::get_root_version_from_env(self) + } +} + #[derive(Debug)] pub struct FeatureVersionResult { pub version: Option, -- cgit v1.3.1