aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/tests/repository
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-06-28 17:45:06 +0900
committernsfisis <nsfisis@gmail.com>2026-06-28 17:45:26 +0900
commit53f1fb395f33e0fb8db9aebd09ea9082f650f9f1 (patch)
treef9e8bf0e9d4b1e98cce383574fb6a13b684fff08 /crates/shirabe/tests/repository
parent212f5cd75b1403ee75ffa44d7ebdb181174340c0 (diff)
downloadphp-shirabe-53f1fb395f33e0fb8db9aebd09ea9082f650f9f1.tar.gz
php-shirabe-53f1fb395f33e0fb8db9aebd09ea9082f650f9f1.tar.zst
php-shirabe-53f1fb395f33e0fb8db9aebd09ea9082f650f9f1.zip
refactor: add linter
Diffstat (limited to 'crates/shirabe/tests/repository')
-rw-r--r--crates/shirabe/tests/repository/array_repository_test.rs3
-rw-r--r--crates/shirabe/tests/repository/artifact_repository_test.rs5
-rw-r--r--crates/shirabe/tests/repository/composer_repository_test.rs8
-rw-r--r--crates/shirabe/tests/repository/composite_repository_test.rs3
-rw-r--r--crates/shirabe/tests/repository/filesystem_repository_test.rs8
-rw-r--r--crates/shirabe/tests/repository/filter_repository_test.rs3
-rw-r--r--crates/shirabe/tests/repository/installed_repository_test.rs3
-rw-r--r--crates/shirabe/tests/repository/path_repository_test.rs8
-rw-r--r--crates/shirabe/tests/repository/repository_factory_test.rs5
-rw-r--r--crates/shirabe/tests/repository/repository_manager_test.rs5
-rw-r--r--crates/shirabe/tests/repository/repository_utils_test.rs3
-rw-r--r--crates/shirabe/tests/repository/vcs/forgejo_driver_test.rs10
-rw-r--r--crates/shirabe/tests/repository/vcs/fossil_driver_test.rs5
-rw-r--r--crates/shirabe/tests/repository/vcs/git_bitbucket_driver_test.rs10
-rw-r--r--crates/shirabe/tests/repository/vcs/git_driver_test.rs12
-rw-r--r--crates/shirabe/tests/repository/vcs/github_driver_test.rs16
-rw-r--r--crates/shirabe/tests/repository/vcs/gitlab_driver_test.rs10
-rw-r--r--crates/shirabe/tests/repository/vcs/hg_driver_test.rs12
-rw-r--r--crates/shirabe/tests/repository/vcs/perforce_driver_test.rs8
-rw-r--r--crates/shirabe/tests/repository/vcs/svn_driver_test.rs12
-rw-r--r--crates/shirabe/tests/repository/vcs_repository_test.rs18
21 files changed, 69 insertions, 98 deletions
diff --git a/crates/shirabe/tests/repository/array_repository_test.rs b/crates/shirabe/tests/repository/array_repository_test.rs
index 1612b7c..ae6725d 100644
--- a/crates/shirabe/tests/repository/array_repository_test.rs
+++ b/crates/shirabe/tests/repository/array_repository_test.rs
@@ -1,5 +1,6 @@
//! ref: composer/tests/Composer/Test/Repository/ArrayRepositoryTest.php
+use crate::test_case::{get_alias_package, get_package};
use indexmap::IndexMap;
use shirabe::package::handle::PackageInterfaceHandle;
use shirabe::package::loader::array_loader::ArrayLoader;
@@ -8,8 +9,6 @@ use shirabe::repository::{
};
use shirabe_php_shim::PhpMixed;
-use crate::test_case::{get_alias_package, get_package};
-
/// PHP `setType`/`setAbandoned` operate on non-root packages; the public handle API only allows
/// such setters on root packages, so packages carrying extra config are built via ArrayLoader.
fn loaded(name: &str, version: &str, extra: Vec<(&str, PhpMixed)>) -> PackageInterfaceHandle {
diff --git a/crates/shirabe/tests/repository/artifact_repository_test.rs b/crates/shirabe/tests/repository/artifact_repository_test.rs
index 90e5625..558ee8b 100644
--- a/crates/shirabe/tests/repository/artifact_repository_test.rs
+++ b/crates/shirabe/tests/repository/artifact_repository_test.rs
@@ -1,12 +1,11 @@
//! ref: composer/tests/Composer/Test/Repository/ArtifactRepositoryTest.php
-use std::cell::RefCell;
-use std::rc::Rc;
-
use indexmap::IndexMap;
use shirabe::io::{IOInterface, NullIO};
use shirabe::repository::ArtifactRepository;
use shirabe_php_shim::{PhpMixed, extension_loaded};
+use std::cell::RefCell;
+use std::rc::Rc;
/// Returns true when the test should be skipped because the zip extension is
/// unavailable, mirroring PHP's markTestSkipped in setUp.
diff --git a/crates/shirabe/tests/repository/composer_repository_test.rs b/crates/shirabe/tests/repository/composer_repository_test.rs
index ae82b24..8e5a7f1 100644
--- a/crates/shirabe/tests/repository/composer_repository_test.rs
+++ b/crates/shirabe/tests/repository/composer_repository_test.rs
@@ -1,8 +1,6 @@
//! ref: composer/tests/Composer/Test/Repository/ComposerRepositoryTest.php
-use std::cell::RefCell;
-use std::rc::Rc;
-
+use crate::http_downloader_mock::{HttpDownloaderMockGuard, expect_full, get_http_downloader_mock};
use indexmap::IndexMap;
use shirabe::config::Config;
use shirabe::io::IOInterface;
@@ -13,10 +11,10 @@ use shirabe::repository::composer_repository::{ComposerRepository, ProviderListi
use shirabe::util::http_downloader::HttpDownloaderMockHandler;
use shirabe_php_shim::PhpMixed;
use shirabe_semver::constraint::{AnyConstraint, SimpleConstraint};
+use std::cell::RefCell;
+use std::rc::Rc;
use tempfile::TempDir;
-use crate::http_downloader_mock::{HttpDownloaderMockGuard, expect_full, get_http_downloader_mock};
-
// Mirrors PHP's `['url' => .., 'body' => ..]` mock entry (status defaults to 200,
// options match any executed options).
fn http_body(
diff --git a/crates/shirabe/tests/repository/composite_repository_test.rs b/crates/shirabe/tests/repository/composite_repository_test.rs
index eed01f6..5fa0fb8 100644
--- a/crates/shirabe/tests/repository/composite_repository_test.rs
+++ b/crates/shirabe/tests/repository/composite_repository_test.rs
@@ -1,13 +1,12 @@
//! ref: composer/tests/Composer/Test/Repository/CompositeRepositoryTest.php
+use crate::test_case::get_package;
use shirabe::package::handle::PackageInterfaceHandle;
use shirabe::repository::{
ArrayRepository, CompositeRepository, FindPackageConstraint, RepositoryInterface,
RepositoryInterfaceHandle, SEARCH_FULLTEXT,
};
-use crate::test_case::get_package;
-
fn array_repo(packages: Vec<PackageInterfaceHandle>) -> RepositoryInterfaceHandle {
RepositoryInterfaceHandle::new(ArrayRepository::new(packages).unwrap())
}
diff --git a/crates/shirabe/tests/repository/filesystem_repository_test.rs b/crates/shirabe/tests/repository/filesystem_repository_test.rs
index 7459486..e8bdddb 100644
--- a/crates/shirabe/tests/repository/filesystem_repository_test.rs
+++ b/crates/shirabe/tests/repository/filesystem_repository_test.rs
@@ -1,8 +1,6 @@
//! ref: composer/tests/Composer/Test/Repository/FilesystemRepositoryTest.php
-use std::cell::RefCell;
-use std::rc::Rc;
-
+use crate::test_case::{get_alias_package, get_package};
use indexmap::IndexMap;
use shirabe::dependency_resolver::operation::OperationInterface;
use shirabe::installed_versions::InstalledVersions;
@@ -17,8 +15,8 @@ use shirabe::repository::filesystem_repository::FilesystemRepository;
use shirabe::util::filesystem::Filesystem;
use shirabe_php_shim::PhpMixed;
use shirabe_semver::VersionParser;
-
-use crate::test_case::{get_alias_package, get_package};
+use std::cell::RefCell;
+use std::rc::Rc;
/// PHP mocks JsonFile::read()/exists(); without a mocking framework the canned read value is
/// materialized as a real temp file whose decoded JSON reproduces the mock return value exactly.
diff --git a/crates/shirabe/tests/repository/filter_repository_test.rs b/crates/shirabe/tests/repository/filter_repository_test.rs
index a244f52..4a6c112 100644
--- a/crates/shirabe/tests/repository/filter_repository_test.rs
+++ b/crates/shirabe/tests/repository/filter_repository_test.rs
@@ -1,5 +1,6 @@
//! ref: composer/tests/Composer/Test/Repository/FilterRepositoryTest.php
+use crate::test_case::get_package;
use indexmap::IndexMap;
use shirabe::package::base_package::STABILITIES;
use shirabe::repository::{
@@ -8,8 +9,6 @@ use shirabe::repository::{
};
use shirabe_semver::constraint::{AnyConstraint, MatchAllConstraint};
-use crate::test_case::get_package;
-
fn set_up() -> RepositoryInterfaceHandle {
let repo = ArrayRepository::new(vec![
get_package("foo/aaa", "1.0.0"),
diff --git a/crates/shirabe/tests/repository/installed_repository_test.rs b/crates/shirabe/tests/repository/installed_repository_test.rs
index ec56b5f..5aa85e9 100644
--- a/crates/shirabe/tests/repository/installed_repository_test.rs
+++ b/crates/shirabe/tests/repository/installed_repository_test.rs
@@ -1,5 +1,6 @@
//! ref: composer/tests/Composer/Test/Repository/InstalledRepositoryTest.php
+use crate::test_case::get_package;
use indexmap::IndexMap;
use shirabe::package::handle::PackageInterfaceHandle;
use shirabe::package::loader::array_loader::ArrayLoader;
@@ -9,8 +10,6 @@ use shirabe::repository::{
};
use shirabe_php_shim::PhpMixed;
-use crate::test_case::get_package;
-
/// PHP `setReplaces`/`setProvides` operate on non-root packages; the public handle API only allows
/// link setters on root packages, so packages carrying links are built via ArrayLoader.
fn loaded(name: &str, version: &str, extra: Vec<(&str, PhpMixed)>) -> PackageInterfaceHandle {
diff --git a/crates/shirabe/tests/repository/path_repository_test.rs b/crates/shirabe/tests/repository/path_repository_test.rs
index bbf4938..f86d659 100644
--- a/crates/shirabe/tests/repository/path_repository_test.rs
+++ b/crates/shirabe/tests/repository/path_repository_test.rs
@@ -1,8 +1,6 @@
//! ref: composer/tests/Composer/Test/Repository/PathRepositoryTest.php
-use std::cell::RefCell;
-use std::rc::Rc;
-
+use crate::test_case::get_package;
use indexmap::IndexMap;
use shirabe::config::Config;
use shirabe::io::{IOInterface, NullIO};
@@ -13,8 +11,8 @@ use shirabe::util::{Platform, ProcessExecutor};
use shirabe_php_shim::{
DIRECTORY_SEPARATOR, PhpMixed, file_get_contents, hash, realpath, serialize,
};
-
-use crate::test_case::get_package;
+use std::cell::RefCell;
+use std::rc::Rc;
fn fixtures_dir() -> String {
format!(
diff --git a/crates/shirabe/tests/repository/repository_factory_test.rs b/crates/shirabe/tests/repository/repository_factory_test.rs
index b1a9001..ef52380 100644
--- a/crates/shirabe/tests/repository/repository_factory_test.rs
+++ b/crates/shirabe/tests/repository/repository_factory_test.rs
@@ -1,8 +1,5 @@
//! ref: composer/tests/Composer/Test/Repository/RepositoryFactoryTest.php
-use std::cell::RefCell;
-use std::rc::Rc;
-
use indexmap::IndexMap;
use shirabe::config::Config;
use shirabe::io::IOInterface;
@@ -10,6 +7,8 @@ use shirabe::io::null_io::NullIO;
use shirabe::repository::RepositoryFactory;
use shirabe::util::http_downloader::HttpDownloader;
use shirabe_php_shim::PhpMixed;
+use std::cell::RefCell;
+use std::rc::Rc;
#[test]
fn test_manager_with_all_repository_types() {
diff --git a/crates/shirabe/tests/repository/repository_manager_test.rs b/crates/shirabe/tests/repository/repository_manager_test.rs
index 732b598..089ce9a 100644
--- a/crates/shirabe/tests/repository/repository_manager_test.rs
+++ b/crates/shirabe/tests/repository/repository_manager_test.rs
@@ -4,9 +4,6 @@
// curl_multi_init, todo!()) with a mocked IO/Config/EventDispatcher and exercise repo
// creation/prepending/wrapping.
-use std::cell::RefCell;
-use std::rc::Rc;
-
use indexmap::IndexMap;
use shirabe::config::Config;
use shirabe::io::IOInterface;
@@ -15,6 +12,8 @@ use shirabe::repository::{ArrayRepository, RepositoryInterfaceHandle, Repository
use shirabe::util::filesystem::Filesystem;
use shirabe::util::http_downloader::HttpDownloader;
use shirabe_php_shim::PhpMixed;
+use std::cell::RefCell;
+use std::rc::Rc;
use tempfile::TempDir;
struct SetUp {
diff --git a/crates/shirabe/tests/repository/repository_utils_test.rs b/crates/shirabe/tests/repository/repository_utils_test.rs
index 1c690e9..a53bb37 100644
--- a/crates/shirabe/tests/repository/repository_utils_test.rs
+++ b/crates/shirabe/tests/repository/repository_utils_test.rs
@@ -1,13 +1,12 @@
//! ref: composer/tests/Composer/Test/Repository/RepositoryUtilsTest.php
+use crate::test_case::{get_alias_package, get_package};
use indexmap::IndexMap;
use shirabe::package::handle::PackageInterfaceHandle;
use shirabe::package::loader::array_loader::ArrayLoader;
use shirabe::repository::RepositoryUtils;
use shirabe_php_shim::PhpMixed;
-use crate::test_case::{get_alias_package, get_package};
-
/// PHP `configureLinks` sets link arrays on non-root packages; the public handle API only allows
/// link setters on root packages, so packages carrying links are built via ArrayLoader.
fn load_with(
diff --git a/crates/shirabe/tests/repository/vcs/forgejo_driver_test.rs b/crates/shirabe/tests/repository/vcs/forgejo_driver_test.rs
index 2e36833..296309f 100644
--- a/crates/shirabe/tests/repository/vcs/forgejo_driver_test.rs
+++ b/crates/shirabe/tests/repository/vcs/forgejo_driver_test.rs
@@ -1,8 +1,7 @@
//! ref: composer/tests/Composer/Test/Repository/Vcs/ForgejoDriverTest.php
-use std::cell::RefCell;
-use std::rc::Rc;
-
+use crate::http_downloader_mock::{HttpDownloaderMockGuard, expect_full, get_http_downloader_mock};
+use crate::process_executor_mock::{ProcessExecutorMockGuard, get_process_executor_mock};
use indexmap::IndexMap;
use shirabe::config::Config;
use shirabe::io::IOInterface;
@@ -12,11 +11,10 @@ use shirabe::util::filesystem::Filesystem;
use shirabe::util::http_downloader::{HttpDownloader, HttpDownloaderMockHandler};
use shirabe::util::process_executor::MockHandler;
use shirabe_php_shim::PhpMixed;
+use std::cell::RefCell;
+use std::rc::Rc;
use tempfile::TempDir;
-use crate::http_downloader_mock::{HttpDownloaderMockGuard, expect_full, get_http_downloader_mock};
-use crate::process_executor_mock::{ProcessExecutorMockGuard, get_process_executor_mock};
-
struct SetUp {
home: TempDir,
config: Rc<RefCell<Config>>,
diff --git a/crates/shirabe/tests/repository/vcs/fossil_driver_test.rs b/crates/shirabe/tests/repository/vcs/fossil_driver_test.rs
index a3986c2..1a5a425 100644
--- a/crates/shirabe/tests/repository/vcs/fossil_driver_test.rs
+++ b/crates/shirabe/tests/repository/vcs/fossil_driver_test.rs
@@ -1,8 +1,5 @@
//! ref: composer/tests/Composer/Test/Repository/Vcs/FossilDriverTest.php
-use std::cell::RefCell;
-use std::rc::Rc;
-
use indexmap::IndexMap;
use shirabe::config::Config;
use shirabe::io::IOInterface;
@@ -10,6 +7,8 @@ use shirabe::io::null_io::NullIO;
use shirabe::repository::vcs::FossilDriver;
use shirabe::util::filesystem::Filesystem;
use shirabe_php_shim::PhpMixed;
+use std::cell::RefCell;
+use std::rc::Rc;
use tempfile::TempDir;
struct SetUp {
diff --git a/crates/shirabe/tests/repository/vcs/git_bitbucket_driver_test.rs b/crates/shirabe/tests/repository/vcs/git_bitbucket_driver_test.rs
index 5bf3ee4..124d529 100644
--- a/crates/shirabe/tests/repository/vcs/git_bitbucket_driver_test.rs
+++ b/crates/shirabe/tests/repository/vcs/git_bitbucket_driver_test.rs
@@ -1,8 +1,7 @@
//! ref: composer/tests/Composer/Test/Repository/Vcs/GitBitbucketDriverTest.php
-use std::cell::RefCell;
-use std::rc::Rc;
-
+use crate::http_downloader_mock::{HttpDownloaderMockGuard, expect_full, get_http_downloader_mock};
+use crate::io_stub::IOStub;
use indexmap::IndexMap;
use shirabe::config::Config;
use shirabe::io::IOInterface;
@@ -12,11 +11,10 @@ use shirabe::util::filesystem::Filesystem;
use shirabe::util::http_downloader::{HttpDownloader, HttpDownloaderMockHandler};
use shirabe::util::process_executor::ProcessExecutor;
use shirabe_php_shim::{InvalidArgumentException, PhpMixed, RuntimeException};
+use std::cell::RefCell;
+use std::rc::Rc;
use tempfile::TempDir;
-use crate::http_downloader_mock::{HttpDownloaderMockGuard, expect_full, get_http_downloader_mock};
-use crate::io_stub::IOStub;
-
struct SetUp {
home: TempDir,
config: Config,
diff --git a/crates/shirabe/tests/repository/vcs/git_driver_test.rs b/crates/shirabe/tests/repository/vcs/git_driver_test.rs
index 7c30b21..be26dd1 100644
--- a/crates/shirabe/tests/repository/vcs/git_driver_test.rs
+++ b/crates/shirabe/tests/repository/vcs/git_driver_test.rs
@@ -1,8 +1,8 @@
//! ref: composer/tests/Composer/Test/Repository/Vcs/GitDriverTest.php
-use std::cell::RefCell;
-use std::rc::Rc;
-
+use crate::http_downloader_mock::{HttpDownloaderMockGuard, get_http_downloader_mock};
+use crate::io_stub::IOStub;
+use crate::process_executor_mock::{ProcessExecutorMockGuard, cmd_full, get_process_executor_mock};
use indexmap::IndexMap;
use serial_test::serial;
use shirabe::config::Config;
@@ -13,12 +13,10 @@ use shirabe::util::http_downloader::HttpDownloaderMockHandler;
use shirabe::util::platform::Platform;
use shirabe::util::process_executor::MockHandler;
use shirabe_php_shim::{PhpMixed, RuntimeException};
+use std::cell::RefCell;
+use std::rc::Rc;
use tempfile::TempDir;
-use crate::http_downloader_mock::{HttpDownloaderMockGuard, get_http_downloader_mock};
-use crate::io_stub::IOStub;
-use crate::process_executor_mock::{ProcessExecutorMockGuard, cmd_full, get_process_executor_mock};
-
struct SetUp {
home: TempDir,
config: Config,
diff --git a/crates/shirabe/tests/repository/vcs/github_driver_test.rs b/crates/shirabe/tests/repository/vcs/github_driver_test.rs
index f1084f5..11da393 100644
--- a/crates/shirabe/tests/repository/vcs/github_driver_test.rs
+++ b/crates/shirabe/tests/repository/vcs/github_driver_test.rs
@@ -1,8 +1,10 @@
//! ref: composer/tests/Composer/Test/Repository/Vcs/GitHubDriverTest.php
-use std::cell::RefCell;
-use std::rc::Rc;
-
+use crate::http_downloader_mock::{HttpDownloaderMockGuard, expect_full, get_http_downloader_mock};
+use crate::io_stub::IOStub;
+use crate::process_executor_mock::{
+ ProcessExecutorMockGuard, cmd, cmd_full, get_process_executor_mock,
+};
use indexmap::IndexMap;
use shirabe::config::Config;
use shirabe::config::ConfigSourceInterface;
@@ -13,14 +15,10 @@ use shirabe::util::filesystem::Filesystem;
use shirabe::util::http_downloader::HttpDownloaderMockHandler;
use shirabe::util::process_executor::{MockHandler, ProcessExecutor};
use shirabe_php_shim::PhpMixed;
+use std::cell::RefCell;
+use std::rc::Rc;
use tempfile::TempDir;
-use crate::http_downloader_mock::{HttpDownloaderMockGuard, expect_full, get_http_downloader_mock};
-use crate::io_stub::IOStub;
-use crate::process_executor_mock::{
- ProcessExecutorMockGuard, cmd, cmd_full, get_process_executor_mock,
-};
-
struct SetUp {
home: TempDir,
config: Config,
diff --git a/crates/shirabe/tests/repository/vcs/gitlab_driver_test.rs b/crates/shirabe/tests/repository/vcs/gitlab_driver_test.rs
index 437617b..f364863 100644
--- a/crates/shirabe/tests/repository/vcs/gitlab_driver_test.rs
+++ b/crates/shirabe/tests/repository/vcs/gitlab_driver_test.rs
@@ -1,8 +1,7 @@
//! ref: composer/tests/Composer/Test/Repository/Vcs/GitLabDriverTest.php
-use std::cell::RefCell;
-use std::rc::Rc;
-
+use crate::http_downloader_mock::{HttpDownloaderMockGuard, expect_full, get_http_downloader_mock};
+use crate::process_executor_mock::{ProcessExecutorMockGuard, get_process_executor_mock};
use indexmap::IndexMap;
use shirabe::config::Config;
use shirabe::io::IOInterface;
@@ -11,9 +10,8 @@ use shirabe::repository::vcs::GitLabDriver;
use shirabe::util::http_downloader::{HttpDownloader, HttpDownloaderMockHandler};
use shirabe::util::process_executor::{MockHandler, ProcessExecutor};
use shirabe_php_shim::{PhpMixed, extension_loaded};
-
-use crate::http_downloader_mock::{HttpDownloaderMockGuard, expect_full, get_http_downloader_mock};
-use crate::process_executor_mock::{ProcessExecutorMockGuard, get_process_executor_mock};
+use std::cell::RefCell;
+use std::rc::Rc;
// Mirrors GitLabDriverTest::setUp's `gitlab-domains` configuration.
fn make_config() -> Config {
diff --git a/crates/shirabe/tests/repository/vcs/hg_driver_test.rs b/crates/shirabe/tests/repository/vcs/hg_driver_test.rs
index f00cb9d..5e16c67 100644
--- a/crates/shirabe/tests/repository/vcs/hg_driver_test.rs
+++ b/crates/shirabe/tests/repository/vcs/hg_driver_test.rs
@@ -1,8 +1,8 @@
//! ref: composer/tests/Composer/Test/Repository/Vcs/HgDriverTest.php
-use std::cell::RefCell;
-use std::rc::Rc;
-
+use crate::http_downloader_mock::{HttpDownloaderMockGuard, get_http_downloader_mock};
+use crate::io_stub::IOStub;
+use crate::process_executor_mock::{ProcessExecutorMockGuard, cmd_full, get_process_executor_mock};
use indexmap::IndexMap;
use shirabe::config::Config;
use shirabe::io::IOInterface;
@@ -12,12 +12,10 @@ use shirabe::util::filesystem::Filesystem;
use shirabe::util::http_downloader::HttpDownloaderMockHandler;
use shirabe::util::process_executor::MockHandler;
use shirabe_php_shim::{PhpMixed, RuntimeException};
+use std::cell::RefCell;
+use std::rc::Rc;
use tempfile::TempDir;
-use crate::http_downloader_mock::{HttpDownloaderMockGuard, get_http_downloader_mock};
-use crate::io_stub::IOStub;
-use crate::process_executor_mock::{ProcessExecutorMockGuard, cmd_full, get_process_executor_mock};
-
struct SetUp {
home: TempDir,
config: Config,
diff --git a/crates/shirabe/tests/repository/vcs/perforce_driver_test.rs b/crates/shirabe/tests/repository/vcs/perforce_driver_test.rs
index ef55c75..13b36a3 100644
--- a/crates/shirabe/tests/repository/vcs/perforce_driver_test.rs
+++ b/crates/shirabe/tests/repository/vcs/perforce_driver_test.rs
@@ -1,8 +1,6 @@
//! ref: composer/tests/Composer/Test/Repository/Vcs/PerforceDriverTest.php
-use std::cell::RefCell;
-use std::rc::Rc;
-
+use crate::process_executor_mock::{ProcessExecutorMockGuard, get_process_executor_mock};
use indexmap::IndexMap;
use shirabe::config::Config;
use shirabe::io::IOInterface;
@@ -12,10 +10,10 @@ use shirabe::util::HttpDownloader;
use shirabe::util::filesystem::Filesystem;
use shirabe::util::process_executor::MockHandler;
use shirabe_php_shim::PhpMixed;
+use std::cell::RefCell;
+use std::rc::Rc;
use tempfile::TempDir;
-use crate::process_executor_mock::{ProcessExecutorMockGuard, get_process_executor_mock};
-
const TEST_URL: &str = "TEST_PERFORCE_URL";
const TEST_DEPOT: &str = "TEST_DEPOT_CONFIG";
const TEST_BRANCH: &str = "TEST_BRANCH_CONFIG";
diff --git a/crates/shirabe/tests/repository/vcs/svn_driver_test.rs b/crates/shirabe/tests/repository/vcs/svn_driver_test.rs
index a1e79fc..70eeead 100644
--- a/crates/shirabe/tests/repository/vcs/svn_driver_test.rs
+++ b/crates/shirabe/tests/repository/vcs/svn_driver_test.rs
@@ -1,8 +1,8 @@
//! ref: composer/tests/Composer/Test/Repository/Vcs/SvnDriverTest.php
-use std::cell::RefCell;
-use std::rc::Rc;
-
+use crate::http_downloader_mock::{HttpDownloaderMockGuard, get_http_downloader_mock};
+use crate::io_stub::IOStub;
+use crate::process_executor_mock::{ProcessExecutorMockGuard, cmd_full, get_process_executor_mock};
use indexmap::IndexMap;
use shirabe::config::Config;
use shirabe::io::IOInterface;
@@ -12,12 +12,10 @@ use shirabe::util::filesystem::Filesystem;
use shirabe::util::http_downloader::HttpDownloaderMockHandler;
use shirabe::util::process_executor::MockHandler;
use shirabe_php_shim::{PhpMixed, RuntimeException};
+use std::cell::RefCell;
+use std::rc::Rc;
use tempfile::TempDir;
-use crate::http_downloader_mock::{HttpDownloaderMockGuard, get_http_downloader_mock};
-use crate::io_stub::IOStub;
-use crate::process_executor_mock::{ProcessExecutorMockGuard, cmd_full, get_process_executor_mock};
-
struct SetUp {
home: TempDir,
config: Config,
diff --git a/crates/shirabe/tests/repository/vcs_repository_test.rs b/crates/shirabe/tests/repository/vcs_repository_test.rs
index e3b0e84..ed705e8 100644
--- a/crates/shirabe/tests/repository/vcs_repository_test.rs
+++ b/crates/shirabe/tests/repository/vcs_repository_test.rs
@@ -1,11 +1,6 @@
//! ref: composer/tests/Composer/Test/Repository/VcsRepositoryTest.php
-use std::cell::RefCell;
-use std::collections::HashSet;
-use std::process::Command;
-use std::rc::Rc;
-
-use indexmap::IndexMap;
+use indexmap::{IndexMap, IndexSet};
use serial_test::serial;
use shirabe::config::Config;
use shirabe::io::IOInterface;
@@ -16,6 +11,9 @@ use shirabe::util::filesystem::Filesystem;
use shirabe::util::http_downloader::HttpDownloader;
use shirabe::util::r#loop::Loop;
use shirabe_php_shim::PhpMixed;
+use std::cell::RefCell;
+use std::process::Command;
+use std::rc::Rc;
use tempfile::TempDir;
struct SetUp {
@@ -175,7 +173,7 @@ fn test_load_versions() {
let composer_home = set_up.composer_home.path().to_path_buf();
let git_repo = set_up.git_repo.path().to_path_buf();
- let mut expected: HashSet<String> = [
+ let mut expected: IndexSet<String> = [
"0.6.0",
"1.0.0",
"1.0.x-dev",
@@ -238,7 +236,11 @@ fn test_load_versions() {
for package in &packages {
let pretty = package.get_pretty_version();
- assert!(expected.remove(&pretty), "Unexpected version {}", pretty);
+ assert!(
+ expected.shift_remove(&pretty),
+ "Unexpected version {}",
+ pretty
+ );
}
assert!(