aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/tests/package
diff options
context:
space:
mode:
Diffstat (limited to 'crates/shirabe/tests/package')
-rw-r--r--crates/shirabe/tests/package/loader/root_package_loader_test.rs55
-rw-r--r--crates/shirabe/tests/package/loader/validating_array_loader_test.rs74
2 files changed, 55 insertions, 74 deletions
diff --git a/crates/shirabe/tests/package/loader/root_package_loader_test.rs b/crates/shirabe/tests/package/loader/root_package_loader_test.rs
index 7fa970a..93ee93a 100644
--- a/crates/shirabe/tests/package/loader/root_package_loader_test.rs
+++ b/crates/shirabe/tests/package/loader/root_package_loader_test.rs
@@ -4,7 +4,7 @@
// ProcessExecutor / VersionGuesser or require constraints whose parsing goes through a
// look-around regex the regex crate cannot compile.
-use std::cell::{Cell, RefCell};
+use std::cell::RefCell;
use std::rc::Rc;
use indexmap::IndexMap;
@@ -87,25 +87,17 @@ impl Drop for GitVersionGuard {
}
// A test double for the concrete VersionGuesser, supplied through the VersionGuesserInterface seam.
-#[derive(Debug)]
-struct VersionGuesserMock {
- version_data: VersionData,
- guess_version_calls: Rc<Cell<u32>>,
-}
-
-impl VersionGuesserInterface for VersionGuesserMock {
- fn guess_version(
- &mut self,
- _package_config: &IndexMap<String, PhpMixed>,
- _path: &str,
- ) -> anyhow::Result<Option<VersionData>> {
- self.guess_version_calls
- .set(self.guess_version_calls.get() + 1);
- Ok(Some(self.version_data.clone()))
- }
+mockall::mock! {
+ #[derive(Debug)]
+ pub VersionGuesser {}
+ impl VersionGuesserInterface for VersionGuesser {
+ fn guess_version(
+ &mut self,
+ package_config: &IndexMap<String, PhpMixed>,
+ path: &str,
+ ) -> anyhow::Result<Option<VersionData>>;
- fn get_root_version_from_env(&self) -> anyhow::Result<String> {
- unreachable!("COMPOSER_ROOT_VERSION is not set in this test")
+ fn get_root_version_from_env(&self) -> anyhow::Result<String>;
}
}
@@ -253,17 +245,19 @@ fn test_pretty_version_for_root_package_in_version_branch() {
let config = make_config();
let manager = make_manager(&io, &config);
- let guess_version_calls = Rc::new(Cell::new(0u32));
- let version_guesser = VersionGuesserMock {
- version_data: VersionData {
- version: Some("3.0.9999999.9999999-dev".to_string()),
- commit: Some("aabbccddee".to_string()),
- pretty_version: Some("3.0-dev".to_string()),
- feature_version: None,
- feature_pretty_version: None,
- },
- guess_version_calls: guess_version_calls.clone(),
- };
+ let mut version_guesser = MockVersionGuesser::new();
+ version_guesser
+ .expect_guess_version()
+ .times(1..)
+ .returning(|_, _| {
+ Ok(Some(VersionData {
+ version: Some("3.0.9999999.9999999-dev".to_string()),
+ commit: Some("aabbccddee".to_string()),
+ pretty_version: Some("3.0-dev".to_string()),
+ feature_version: None,
+ feature_pretty_version: None,
+ }))
+ });
let mut loader = RootPackageLoader::new(
manager,
@@ -277,7 +271,6 @@ fn test_pretty_version_for_root_package_in_version_branch() {
.load(IndexMap::new(), "Composer\\Package\\RootPackage", None)
.unwrap();
- assert!(guess_version_calls.get() >= 1);
assert_eq!("3.0-dev", package.as_root().unwrap().get_pretty_version());
}
diff --git a/crates/shirabe/tests/package/loader/validating_array_loader_test.rs b/crates/shirabe/tests/package/loader/validating_array_loader_test.rs
index 2394af2..aeafefd 100644
--- a/crates/shirabe/tests/package/loader/validating_array_loader_test.rs
+++ b/crates/shirabe/tests/package/loader/validating_array_loader_test.rs
@@ -1,8 +1,5 @@
//! ref: composer/tests/Composer/Test/Package/Loader/ValidatingArrayLoaderTest.php
-use std::cell::RefCell;
-use std::rc::Rc;
-
use indexmap::IndexMap;
use shirabe::package::handle::PackageInterfaceHandle;
use shirabe::package::loader::{InvalidPackageException, LoaderInterface, ValidatingArrayLoader};
@@ -49,40 +46,29 @@ fn config(entries: Vec<(&str, PhpMixed)>) -> IndexMap<String, PhpMixed> {
m
}
-type Calls = Rc<RefCell<Vec<IndexMap<String, PhpMixed>>>>;
-
-/// Mock LoaderInterface recording every `load` invocation, mirroring PHPUnit's
-/// `expects($this->once())->method('load')->with(...)`.
-#[derive(Debug)]
-struct MockLoader {
- calls: Calls,
-}
-
-impl MockLoader {
- fn new() -> (Self, Calls) {
- let calls: Calls = Rc::new(RefCell::new(Vec::new()));
- (
- MockLoader {
- calls: calls.clone(),
- },
- calls,
- )
+// PHP mocks `Composer\Package\Loader\LoaderInterface` with getMockBuilder.
+mockall::mock! {
+ #[derive(Debug)]
+ Loader {}
+ impl LoaderInterface for Loader {
+ fn load(
+ &self,
+ config: IndexMap<String, PhpMixed>,
+ class: Option<String>,
+ ) -> anyhow::Result<PackageInterfaceHandle>;
+ fn as_any(&self) -> &dyn std::any::Any;
}
}
-impl LoaderInterface for MockLoader {
- fn load(
- &self,
- config: IndexMap<String, PhpMixed>,
- _class: Option<String>,
- ) -> anyhow::Result<PackageInterfaceHandle> {
- self.calls.borrow_mut().push(config);
- Ok(test_case::get_package("mock/mock", "1.0.0"))
- }
-
- fn as_any(&self) -> &dyn std::any::Any {
- self
- }
+/// Build a mock inner loader whose `load` returns a dummy package, mirroring
+/// PHPUnit's `getMockBuilder(LoaderInterface::class)->getMock()` with no
+/// configured expectations.
+fn mock_loader() -> MockLoader {
+ let mut loader = MockLoader::new();
+ loader
+ .expect_load()
+ .returning(|_, _| Ok(test_case::get_package("mock/mock", "1.0.0")));
+ loader
}
fn invalid_naming_error(name: &str) -> Vec<String> {
@@ -369,7 +355,7 @@ fn success_provider() -> Vec<IndexMap<String, PhpMixed>> {
#[test]
fn test_load_success() {
for cfg in success_provider() {
- let (internal_loader, _calls) = MockLoader::new();
+ let internal_loader = mock_loader();
let mut loader = ValidatingArrayLoader::new(
Box::new(internal_loader),
true,
@@ -796,7 +782,7 @@ fn error_provider() -> Vec<(IndexMap<String, PhpMixed>, Vec<String>)> {
#[test]
fn test_load_failure_throws_exception() {
for (cfg, mut expected_errors) in error_provider() {
- let (internal_loader, _calls) = MockLoader::new();
+ let internal_loader = mock_loader();
let mut loader = ValidatingArrayLoader::new(
Box::new(internal_loader),
true,
@@ -978,7 +964,7 @@ fn warning_provider() -> Vec<(
#[test]
fn test_load_warnings() {
for (cfg, mut expected_warnings, _must_check, _expected_array) in warning_provider() {
- let (internal_loader, _calls) = MockLoader::new();
+ let internal_loader = mock_loader();
let mut loader = ValidatingArrayLoader::new(
Box::new(internal_loader),
true,
@@ -1003,9 +989,16 @@ fn test_load_skips_warning_data_when_ignoring_errors() {
if !must_check {
continue;
}
- let (internal_loader, calls) = MockLoader::new();
let expected = expected_array.unwrap_or_else(|| config(vec![("name", s("a/b"))]));
+ // The inner loader is called exactly once with the (post-validation) config.
+ let mut internal_loader = MockLoader::new();
+ internal_loader
+ .expect_load()
+ .times(1)
+ .withf(move |cfg, _class| *cfg == expected)
+ .returning(|_, _| Ok(test_case::get_package("mock/mock", "1.0.0")));
+
let mut loader = ValidatingArrayLoader::new(
Box::new(internal_loader),
true,
@@ -1016,10 +1009,5 @@ fn test_load_skips_warning_data_when_ignoring_errors() {
loader
.load(cfg, "Composer\\Package\\CompletePackage")
.unwrap();
-
- // The mock recorded exactly the (post-validation) config passed to the inner loader.
- let recorded = calls.borrow();
- assert_eq!(recorded.len(), 1);
- assert_eq!(recorded[0], expected);
}
}
generated by cgit v1.3.1 (git 2.54.0) at 2026-07-21 20:56:29 +0000