diff options
Diffstat (limited to 'crates/shirabe/tests/package')
3 files changed, 7 insertions, 7 deletions
diff --git a/crates/shirabe/tests/package/archiver/archive_manager_test.rs b/crates/shirabe/tests/package/archiver/archive_manager_test.rs index a7235bf9..84feb5bc 100644 --- a/crates/shirabe/tests/package/archiver/archive_manager_test.rs +++ b/crates/shirabe/tests/package/archiver/archive_manager_test.rs @@ -13,6 +13,7 @@ use shirabe::util::ProcessExecutor; use shirabe::util::http_downloader::HttpDownloader; use shirabe::util::r#loop::Loop; use shirabe_external_packages::symfony::process::Process; +use shirabe_php_shim::Catch as _; use shirabe_php_shim::{ PhpMixed, file_exists, file_put_contents, realpath, sys_get_temp_dir, unlink, }; @@ -159,10 +160,7 @@ fn test_unknown_format() { ); let err = result.expect_err("expected RuntimeException for unknown format"); - assert!( - err.downcast_ref::<shirabe_php_shim::RuntimeException>() - .is_some() - ); + assert!(err.is_instanceof::<shirabe_php_shim::RuntimeException>()); } // ref: ArchiveManagerTest::testArchiveTar / testArchiveCustomFileName. 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 07f3e4a6..1b1ed448 100644 --- a/crates/shirabe/tests/package/loader/validating_array_loader_test.rs +++ b/crates/shirabe/tests/package/loader/validating_array_loader_test.rs @@ -4,6 +4,7 @@ use crate::test_case; use indexmap::IndexMap; use shirabe::package::handle::PackageInterfaceHandle; use shirabe::package::loader::{InvalidPackageException, LoaderInterface, ValidatingArrayLoader}; +use shirabe_php_shim::Catch as _; use shirabe_php_shim::PhpMixed; fn s(v: &str) -> PhpMixed { @@ -792,7 +793,7 @@ fn test_load_failure_throws_exception() { Ok(_) => panic!("Expected exception to be thrown"), Err(e) => { let exception = e - .downcast_ref::<InvalidPackageException>() + .catch::<InvalidPackageException>() .expect("Expected InvalidPackageException"); let mut errors: Vec<String> = exception.get_errors().to_vec(); expected_errors.sort(); diff --git a/crates/shirabe/tests/package/locker_test.rs b/crates/shirabe/tests/package/locker_test.rs index f1747166..4732d679 100644 --- a/crates/shirabe/tests/package/locker_test.rs +++ b/crates/shirabe/tests/package/locker_test.rs @@ -10,6 +10,7 @@ use shirabe::package::handle::{CompletePackageHandle, PackageInterfaceHandle}; use shirabe::plugin::plugin_interface; use shirabe::repository::{FindPackageConstraint, RepositoryInterfaceHandle}; use shirabe::util::process_executor::ProcessExecutor; +use shirabe_php_shim::Catch as _; use shirabe_php_shim::{LogicException, PhpMixed, hash}; use tempfile::TempDir; @@ -83,7 +84,7 @@ fn test_get_not_locked_packages() { .get_locked_repository(false) .expect_err("getLockedRepository should fail when no lock file exists"); assert!( - err.downcast_ref::<LogicException>().is_some(), + err.is_instanceof::<LogicException>(), "expected LogicException, got: {err}" ); } @@ -219,7 +220,7 @@ fn test_lock_bad_packages() { ) .expect_err("setLockData should fail for a package with no version"); assert!( - err.downcast_ref::<LogicException>().is_some(), + err.is_instanceof::<LogicException>(), "expected LogicException, got: {err}" ); } |