diff options
Diffstat (limited to 'crates/shirabe/tests/installer')
6 files changed, 51 insertions, 44 deletions
diff --git a/crates/shirabe/tests/installer/binary_installer_test.rs b/crates/shirabe/tests/installer/binary_installer_test.rs index 6b3cae5d..8b2d0636 100644 --- a/crates/shirabe/tests/installer/binary_installer_test.rs +++ b/crates/shirabe/tests/installer/binary_installer_test.rs @@ -7,9 +7,7 @@ use shirabe::io::IOInterface; use shirabe::io::null_io::NullIO; use shirabe::util::Filesystem; use shirabe::util::ProcessExecutor; -use std::cell::RefCell; use std::fs; -use std::rc::Rc; use tempfile::TempDir; /// Mirror of setUp(): builds temp root/vendor/bin dirs plus a mocked IO. PHP uses a @@ -18,7 +16,7 @@ struct SetUp { root: TempDir, vendor_dir: String, bin_dir: String, - io: Rc<RefCell<dyn IOInterface>>, + io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>>, fs: Filesystem, } @@ -37,7 +35,8 @@ fn set_up() -> SetUp { let bin_dir = format!("{}/bin", root_dir); fs::create_dir_all(&bin_dir).unwrap(); - let io: Rc<RefCell<dyn IOInterface>> = Rc::new(RefCell::new(NullIO::new())); + let io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>> = + std::rc::Rc::new(std::cell::RefCell::new(NullIO::new())); SetUp { root, @@ -94,7 +93,9 @@ fn run_install_and_exec_binary_with_full_compat(contents: &[u8]) { setup.io.clone(), setup.bin_dir.clone(), "full".to_string(), - Some(Rc::new(RefCell::new(Filesystem::new(None)))), + Some(std::rc::Rc::new(std::cell::RefCell::new(Filesystem::new( + None, + )))), None, ); installer.install_binaries(package, &pkg_dir, true); diff --git a/crates/shirabe/tests/installer/installation_manager_test.rs b/crates/shirabe/tests/installer/installation_manager_test.rs index bc1fcfdc..e3e4c0fc 100644 --- a/crates/shirabe/tests/installer/installation_manager_test.rs +++ b/crates/shirabe/tests/installer/installation_manager_test.rs @@ -14,8 +14,6 @@ use shirabe::util::http_downloader::HttpDownloader; use shirabe::util::r#loop::Loop; use shirabe_php_shim::PhpMixed; use shirabe_semver::VersionParser; -use std::cell::RefCell; -use std::rc::Rc; fn run<F: std::future::Future>(future: F) -> F::Output { tokio::runtime::Builder::new_current_thread() @@ -27,17 +25,23 @@ fn run<F: std::future::Future>(future: F) -> F::Output { /// ref: setUp(): the PHP loop/io mocks are never exercised by these tests (the loop has its /// constructor disabled), so a real Loop over a real HttpDownloader and a NullIO stand in. struct SetUp { - loop_: Rc<RefCell<Loop>>, - io: Rc<RefCell<dyn IOInterface>>, + loop_: std::rc::Rc<std::cell::RefCell<Loop>>, + io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>>, } fn set_up() -> SetUp { - let io: Rc<RefCell<dyn IOInterface>> = Rc::new(RefCell::new(NullIO::new())); - let config = Rc::new(RefCell::new(shirabe::config::Config::new(false, None))); + let io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>> = + std::rc::Rc::new(std::cell::RefCell::new(NullIO::new())); + let config = std::rc::Rc::new(std::cell::RefCell::new(shirabe::config::Config::new( + false, None, + ))); // The PHP loop mock has its constructor disabled and is never exercised by these tests, so a // mock HttpDownloader (no real curl backend) stands in. - let http_downloader = Rc::new(RefCell::new(HttpDownloader::__new_mock(io.clone(), config))); - let loop_ = Rc::new(RefCell::new(Loop::new(http_downloader, None))); + let http_downloader = std::rc::Rc::new(std::cell::RefCell::new(HttpDownloader::__new_mock( + io.clone(), + config, + ))); + let loop_ = std::rc::Rc::new(std::cell::RefCell::new(Loop::new(http_downloader, None))); SetUp { loop_, io } } @@ -150,12 +154,12 @@ struct BinaryInstallerCalls { #[derive(Debug)] struct BinaryInstaller { - calls: Rc<RefCell<BinaryInstallerCalls>>, + calls: std::rc::Rc<std::cell::RefCell<BinaryInstallerCalls>>, } impl BinaryInstaller { - fn new() -> (Self, Rc<RefCell<BinaryInstallerCalls>>) { - let calls = Rc::new(RefCell::new(BinaryInstallerCalls::default())); + fn new() -> (Self, std::rc::Rc<std::cell::RefCell<BinaryInstallerCalls>>) { + let calls = std::rc::Rc::new(std::cell::RefCell::new(BinaryInstallerCalls::default())); ( Self { calls: calls.clone(), @@ -262,7 +266,7 @@ fn typed_package(name: &str, version: &str, r#type: &str) -> PackageInterfaceHan } fn same_handle(a: &PackageInterfaceHandle, b: &PackageInterfaceHandle) -> bool { - Rc::ptr_eq(a.as_rc(), b.as_rc()) + std::rc::Rc::ptr_eq(a.as_rc(), b.as_rc()) } #[test] diff --git a/crates/shirabe/tests/installer/installer_event_test.rs b/crates/shirabe/tests/installer/installer_event_test.rs index b3bf14df..8a8887ab 100644 --- a/crates/shirabe/tests/installer/installer_event_test.rs +++ b/crates/shirabe/tests/installer/installer_event_test.rs @@ -6,14 +6,13 @@ use shirabe::event_dispatcher::EventInterface; use shirabe::installer::InstallerEvent; use shirabe::io::IOInterface; use shirabe::io::null_io::NullIO; -use std::cell::RefCell; -use std::rc::Rc; #[test] fn test_getter() { - let composer_rc = Rc::new(RefCell::new(PartialOrFullComposer::new_full())); + let composer_rc = std::rc::Rc::new(std::cell::RefCell::new(PartialOrFullComposer::new_full())); let composer = ComposerHandle::from_rc_unchecked(composer_rc); - let io: Rc<RefCell<dyn IOInterface>> = Rc::new(RefCell::new(NullIO::new())); + let io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>> = + std::rc::Rc::new(std::cell::RefCell::new(NullIO::new())); let transaction = Transaction::new(vec![], vec![]); let event = InstallerEvent::new( "EVENT_NAME".to_string(), diff --git a/crates/shirabe/tests/installer/library_installer_test.rs b/crates/shirabe/tests/installer/library_installer_test.rs index 44c7e5f7..72272a07 100644 --- a/crates/shirabe/tests/installer/library_installer_test.rs +++ b/crates/shirabe/tests/installer/library_installer_test.rs @@ -16,9 +16,7 @@ use shirabe::repository::RepositoryInterface; use shirabe::repository::WritableRepositoryInterface; use shirabe::util::filesystem::Filesystem; use shirabe_php_shim::PhpMixed; -use std::cell::RefCell; use std::fs; -use std::rc::Rc; use tempfile::TempDir; // PHP mocks `Composer\Downloader\DownloadManager` with getMockBuilder and asserts its @@ -34,7 +32,7 @@ mockall::mock! { fn get_downloader_for_package( &self, package: PackageInterfaceHandle, - ) -> anyhow::Result<Option<Rc<RefCell<dyn DownloaderInterface>>>>; + ) -> anyhow::Result<Option<std::rc::Rc<std::cell::RefCell<dyn DownloaderInterface>>>>; async fn download( &self, package: PackageInterfaceHandle, @@ -104,7 +102,7 @@ struct SetUp { root: TempDir, vendor_dir: String, bin_dir: String, - io: Rc<RefCell<dyn IOInterface>>, + io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>>, composer: PartialComposerWeakHandle, fs: Filesystem, composer_full: ComposerHandle, @@ -116,7 +114,7 @@ fn set_download_manager(setup: &SetUp, dm: MockDownloadManager) { setup .composer_full .borrow_mut() - .set_download_manager(Rc::new(RefCell::new(dm))); + .set_download_manager(std::rc::Rc::new(std::cell::RefCell::new(dm))); } fn set_up() -> SetUp { @@ -144,11 +142,12 @@ fn set_up() -> SetUp { let mut merged: IndexMap<String, PhpMixed> = IndexMap::new(); merged.insert("config".to_string(), PhpMixed::Array(config_section)); config.merge(&merged, Config::SOURCE_UNKNOWN); - let config_rc = Rc::new(RefCell::new(config)); + let config_rc = std::rc::Rc::new(std::cell::RefCell::new(config)); - let io: Rc<RefCell<dyn IOInterface>> = Rc::new(RefCell::new(NullIO::new())); + let io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>> = + std::rc::Rc::new(std::cell::RefCell::new(NullIO::new())); - let composer_rc = Rc::new(RefCell::new(PartialOrFullComposer::new_full())); + let composer_rc = std::rc::Rc::new(std::cell::RefCell::new(PartialOrFullComposer::new_full())); let composer = ComposerHandle::from_rc_unchecked(composer_rc.clone()); composer.borrow_mut().set_config(config_rc); // Default unconfigured mock so LibraryInstaller::new can resolve a DownloadManager even in @@ -156,7 +155,9 @@ fn set_up() -> SetUp { // set_download_manager. composer .borrow_mut() - .set_download_manager(Rc::new(RefCell::new(MockDownloadManager::new()))); + .set_download_manager(std::rc::Rc::new(std::cell::RefCell::new( + MockDownloadManager::new(), + ))); let weak = PartialComposerHandle::from_rc(composer_rc).downgrade(); @@ -236,7 +237,7 @@ fn test_install() { dm.expect_install() .times(1) .withf_st(move |package, target_dir| { - Rc::ptr_eq(package.as_rc(), expected_package.as_rc()) + std::rc::Rc::ptr_eq(package.as_rc(), expected_package.as_rc()) && target_dir == expected_path.as_str() }) .returning(|_, _| Ok(None)); @@ -290,8 +291,8 @@ fn test_update() { dm.expect_update() .times(1) .withf_st(move |initial, target, target_dir| { - Rc::ptr_eq(initial.as_rc(), expected_initial.as_rc()) - && Rc::ptr_eq(target.as_rc(), expected_target.as_rc()) + std::rc::Rc::ptr_eq(initial.as_rc(), expected_initial.as_rc()) + && std::rc::Rc::ptr_eq(target.as_rc(), expected_target.as_rc()) && target_dir == expected_path.as_str() }) .returning(|_, _, _| Ok(None)); @@ -343,7 +344,7 @@ fn test_uninstall() { dm.expect_remove() .times(1) .withf_st(move |package, target_dir| { - Rc::ptr_eq(package.as_rc(), expected_package.as_rc()) + std::rc::Rc::ptr_eq(package.as_rc(), expected_package.as_rc()) && target_dir == expected_path.as_str() }) .returning(|_, _| Ok(None)); @@ -426,12 +427,12 @@ fn test_ensure_binaries_installed() { .expect_install_binaries() .times(1) .withf_st(move |package, install_path, warn_on_overwrite| { - Rc::ptr_eq(package.as_rc(), expected_package.as_rc()) + std::rc::Rc::ptr_eq(package.as_rc(), expected_package.as_rc()) && install_path == expected_install_path.as_str() && !*warn_on_overwrite }) .returning(|_, _, _| ()); - library.__set_binary_installer(Rc::new(RefCell::new(binary_installer))); + library.__set_binary_installer(std::rc::Rc::new(std::cell::RefCell::new(binary_installer))); library.ensure_binaries_presence(package.clone()); diff --git a/crates/shirabe/tests/installer/metapackage_installer_test.rs b/crates/shirabe/tests/installer/metapackage_installer_test.rs index 8528f6a7..bc740e74 100644 --- a/crates/shirabe/tests/installer/metapackage_installer_test.rs +++ b/crates/shirabe/tests/installer/metapackage_installer_test.rs @@ -8,8 +8,6 @@ use shirabe::installer::{InstallerInterface, MetapackageInstaller}; use shirabe::io::IOInterface; use shirabe::io::null_io::NullIO; use shirabe::repository::{InstalledArrayRepository, RepositoryInterface}; -use std::cell::RefCell; -use std::rc::Rc; fn run<F: std::future::Future>(future: F) -> F::Output { tokio::runtime::Builder::new_current_thread() @@ -19,7 +17,8 @@ fn run<F: std::future::Future>(future: F) -> F::Output { } fn installer() -> MetapackageInstaller { - let io: Rc<RefCell<dyn IOInterface>> = Rc::new(RefCell::new(NullIO::new())); + let io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>> = + std::rc::Rc::new(std::cell::RefCell::new(NullIO::new())); MetapackageInstaller::new(io) } diff --git a/crates/shirabe/tests/installer/suggested_packages_reporter_test.rs b/crates/shirabe/tests/installer/suggested_packages_reporter_test.rs index 16650853..046e84e4 100644 --- a/crates/shirabe/tests/installer/suggested_packages_reporter_test.rs +++ b/crates/shirabe/tests/installer/suggested_packages_reporter_test.rs @@ -8,16 +8,18 @@ use shirabe::io::IOInterface; use shirabe::io::io_interface; use shirabe::io::null_io::NullIO; use shirabe::repository::{InstalledRepository, LockArrayRepository, RepositoryInterfaceHandle}; -use std::cell::RefCell; -use std::rc::Rc; /// ref: SuggestedPackagesReporterTest::setUp. /// /// Builds an IO mock and a SuggestedPackagesReporter sharing it. The IOMockGuard runs /// assert_complete when it drops at the end of the test scope. -fn set_up() -> (Rc<RefCell<IOMock>>, SuggestedPackagesReporter, IOMockGuard) { +fn set_up() -> ( + std::rc::Rc<std::cell::RefCell<IOMock>>, + SuggestedPackagesReporter, + IOMockGuard, +) { let (mock, guard) = get_io_mock(io_interface::NORMAL).unwrap(); - let io: Rc<RefCell<dyn IOInterface>> = mock.clone(); + let io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>> = mock.clone(); let reporter = SuggestedPackagesReporter::new(io); (mock, reporter, guard) } @@ -32,7 +34,8 @@ fn get_suggested_package_array() -> IndexMap<String, String> { } fn reporter() -> SuggestedPackagesReporter { - let io: Rc<RefCell<dyn IOInterface>> = Rc::new(RefCell::new(NullIO::new())); + let io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>> = + std::rc::Rc::new(std::cell::RefCell::new(NullIO::new())); SuggestedPackagesReporter::new(io) } |