diff options
Diffstat (limited to 'crates/shirabe/tests')
25 files changed, 86 insertions, 90 deletions
diff --git a/crates/shirabe/tests/autoload/autoload_generator_test.rs b/crates/shirabe/tests/autoload/autoload_generator_test.rs index a3b833a..d5f16fb 100644 --- a/crates/shirabe/tests/autoload/autoload_generator_test.rs +++ b/crates/shirabe/tests/autoload/autoload_generator_test.rs @@ -1011,9 +1011,7 @@ fn test_psr_to_class_map_ignores_non_psr_classes() { dump(&mut s, package.into(), true, "_1").unwrap(); assert!(std::path::Path::new(&format!("{}/autoload_classmap.php", composer_out)).exists()); - let expected = format!( - "<?php\n\n// autoload_classmap.php @generated by Composer\n\n$vendorDir = dirname(__DIR__);\n$baseDir = dirname($vendorDir);\n\nreturn array(\n 'Composer\\\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',\n 'psr0_match' => $baseDir . '/psr0/psr0/match.php',\n 'psr4\\\\match' => $baseDir . '/psr4/match.php',\n);\n" - ); + let expected = "<?php\n\n// autoload_classmap.php @generated by Composer\n\n$vendorDir = dirname(__DIR__);\n$baseDir = dirname($vendorDir);\n\nreturn array(\n 'Composer\\\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',\n 'psr0_match' => $baseDir . '/psr0/psr0/match.php',\n 'psr4\\\\match' => $baseDir . '/psr4/match.php',\n);\n".to_string(); let actual = std::fs::read_to_string(format!("{}/autoload_classmap.php", composer_out)).unwrap(); assert_eq!(expected, actual); diff --git a/crates/shirabe/tests/command/base_dependency_command_test.rs b/crates/shirabe/tests/command/base_dependency_command_test.rs index 697face..41ad362 100644 --- a/crates/shirabe/tests/command/base_dependency_command_test.rs +++ b/crates/shirabe/tests/command/base_dependency_command_test.rs @@ -263,8 +263,8 @@ fn test_warning_when_dependencies_are_not_installed() { let some_dev_required_package = get_package("vendor2/package1", "1.0.0"); create_composer_lock( - &[some_required_package.clone()], - &[some_dev_required_package.clone()], + std::slice::from_ref(&some_required_package), + std::slice::from_ref(&some_dev_required_package), ); let mut input: Vec<(PhpMixed, PhpMixed)> = @@ -403,7 +403,7 @@ fn test_why_command_outputs() { second_required_package.clone(), third_required_package.clone(), ], - &[some_dev_required_package.clone()], + std::slice::from_ref(&some_dev_required_package), ); create_installed_json( &[ @@ -411,7 +411,7 @@ fn test_why_command_outputs() { second_required_package.clone(), third_required_package.clone(), ], - &[some_dev_required_package.clone()], + std::slice::from_ref(&some_dev_required_package), true, ); @@ -571,14 +571,14 @@ fn test_why_not_command_outputs() { let second_dev_nested_required_package = get_package("vendor2/package3", "1.4.0"); create_composer_lock( - &[some_required_package.clone()], + std::slice::from_ref(&some_required_package), &[ first_dev_required_package.clone(), second_dev_required_package.clone(), ], ); create_installed_json( - &[some_required_package.clone()], + std::slice::from_ref(&some_required_package), &[ first_dev_required_package.clone(), second_dev_required_package.clone(), diff --git a/crates/shirabe/tests/command/global_command_test.rs b/crates/shirabe/tests/command/global_command_test.rs index 6eec017..4d99613 100644 --- a/crates/shirabe/tests/command/global_command_test.rs +++ b/crates/shirabe/tests/command/global_command_test.rs @@ -287,7 +287,7 @@ fn test_global_update() { let composer_home_str = tear_down.working_dir().to_string_lossy().to_string(); let pkg = get_package("vendor/pkg", "1.0.0"); - create_installed_json(&[pkg.clone()], &[], true); + create_installed_json(std::slice::from_ref(&pkg), &[], true); create_composer_lock(&[pkg], &[]); Platform::put_env("COMPOSER_HOME", &composer_home_str); diff --git a/crates/shirabe/tests/command/init_command_test.rs b/crates/shirabe/tests/command/init_command_test.rs index f8d3e26..efb3f49 100644 --- a/crates/shirabe/tests/command/init_command_test.rs +++ b/crates/shirabe/tests/command/init_command_test.rs @@ -602,7 +602,7 @@ fn test_format_authors() { fn test_get_git_config() { set_up(); - let mut command = InitCommand::new(); + let command = InitCommand::new(); let git_config = command.__get_git_config(); assert!(git_config.contains_key("user.name")); assert!(git_config.contains_key("user.email")); diff --git a/crates/shirabe/tests/command/licenses_command_test.rs b/crates/shirabe/tests/command/licenses_command_test.rs index 05bd7f6..5b25aad 100644 --- a/crates/shirabe/tests/command/licenses_command_test.rs +++ b/crates/shirabe/tests/command/licenses_command_test.rs @@ -190,7 +190,7 @@ fn test_format_summary() { .unwrap(); assert_eq!(0, status_code); - let expected = vec![ + let expected = [ ("-", "-"), ("License", "Number of dependencies"), ("-", "-"), diff --git a/crates/shirabe/tests/command/remove_command_test.rs b/crates/shirabe/tests/command/remove_command_test.rs index f645cc0..a27976a 100644 --- a/crates/shirabe/tests/command/remove_command_test.rs +++ b/crates/shirabe/tests/command/remove_command_test.rs @@ -282,7 +282,7 @@ fn test_remove_unused_package() { let required_package = get_package("root/req", "1.0.0"); let extraneous_package = get_package("not/req", "1.0.0"); - create_installed_json(&[required_package.clone()], &[], true); + create_installed_json(std::slice::from_ref(&required_package), &[], true); create_composer_lock(&[required_package.clone(), extraneous_package.clone()], &[]); let mut app_tester = get_application_tester(); @@ -825,8 +825,8 @@ fn test_package_still_present_error_when_no_install_flag_used() { ); let root_req_package = get_package("root/req", "1.0.0"); - create_installed_json(&[root_req_package.clone()], &[], true); - create_composer_lock(&[root_req_package.clone()], &[]); + create_installed_json(std::slice::from_ref(&root_req_package), &[], true); + create_composer_lock(std::slice::from_ref(&root_req_package), &[]); let mut app_tester = get_application_tester(); let status_code = app_tester @@ -915,8 +915,8 @@ fn run_update_inherited_dependencies_flag_case( let root_req_package = get_package("root/req", "1.0.0"); root_req_package.__set_type("metapackage".to_string()); - create_installed_json(&[root_req_package.clone()], &[], true); - create_composer_lock(&[root_req_package.clone()], &[]); + create_installed_json(std::slice::from_ref(&root_req_package), &[], true); + create_composer_lock(std::slice::from_ref(&root_req_package), &[]); let mut app_tester = get_application_tester(); let status_code = app_tester diff --git a/crates/shirabe/tests/command/show_command_test.rs b/crates/shirabe/tests/command/show_command_test.rs index a73992d..d5f0828 100644 --- a/crates/shirabe/tests/command/show_command_test.rs +++ b/crates/shirabe/tests/command/show_command_test.rs @@ -1218,7 +1218,7 @@ fn run_not_existing_package_case(package: &str, options: Vec<(&str, PhpMixed)>, true, ); let pkg = get_package("vendor/package", "1.0.0"); - create_installed_json(&[pkg.clone()], &[], true); + create_installed_json(std::slice::from_ref(&pkg), &[], true); create_composer_lock(&[pkg], &[]); let mut pairs = vec![ diff --git a/crates/shirabe/tests/command/suggests_command_test.rs b/crates/shirabe/tests/command/suggests_command_test.rs index 8bbb950..e6732dc 100644 --- a/crates/shirabe/tests/command/suggests_command_test.rs +++ b/crates/shirabe/tests/command/suggests_command_test.rs @@ -237,14 +237,14 @@ vendor2/package2 suggests: // 'with lockfile, show suggested (excluding dev)' run_suggest_case( true, - &[no_dev.clone()], + std::slice::from_ref(&no_dev), "vendor1/package1 suggests: - vendor3/suggested: helpful for vendor1/package1 1 additional suggestions by transitive dependencies can be shown with --all", ); // 'without lockfile, show suggested (excluding dev)' - run_suggest_case(false, &[no_dev.clone()], basic); + run_suggest_case(false, std::slice::from_ref(&no_dev), basic); let all_suggested = "vendor1/package1 suggests: - vendor3/suggested: helpful for vendor1/package1 @@ -257,8 +257,8 @@ vendor5/dev-package suggests: vendor6/package6 suggests: - vendor7/transitive: helpful for vendor6/package6"; - run_suggest_case(true, &[all.clone()], all_suggested); - run_suggest_case(false, &[all.clone()], all_suggested); + run_suggest_case(true, std::slice::from_ref(&all), all_suggested); + run_suggest_case(false, std::slice::from_ref(&all), all_suggested); // 'with lockfile, show all suggested (excluding dev)' run_suggest_case( @@ -273,8 +273,8 @@ vendor6/package6 suggests: run_suggest_case(false, &[all.clone(), no_dev.clone()], all_suggested); // grouped by package - run_suggest_case(true, &[by_package.clone()], basic); - run_suggest_case(false, &[by_package.clone()], basic); + run_suggest_case(true, std::slice::from_ref(&by_package), basic); + run_suggest_case(false, std::slice::from_ref(&by_package), basic); run_suggest_case( true, &[by_package.clone(), no_dev.clone()], @@ -293,8 +293,16 @@ vendor4/dev-suggested is suggested by: - vendor2/package2: helpful for vendor2/package2 2 additional suggestions by transitive dependencies can be shown with --all"; - run_suggest_case(true, &[by_suggestion.clone()], by_suggestion_out); - run_suggest_case(false, &[by_suggestion.clone()], by_suggestion_out); + run_suggest_case( + true, + std::slice::from_ref(&by_suggestion), + by_suggestion_out, + ); + run_suggest_case( + false, + std::slice::from_ref(&by_suggestion), + by_suggestion_out, + ); run_suggest_case( true, &[by_suggestion.clone(), no_dev.clone()], @@ -367,8 +375,8 @@ vendor3/suggested is suggested by: // list suggested let list_out = "vendor3/suggested vendor4/dev-suggested"; - run_suggest_case(true, &[list.clone()], list_out); - run_suggest_case(false, &[list.clone()], list_out); + run_suggest_case(true, std::slice::from_ref(&list), list_out); + run_suggest_case(false, std::slice::from_ref(&list), list_out); run_suggest_case(true, &[list.clone(), no_dev.clone()], "vendor3/suggested"); run_suggest_case(false, &[list.clone(), no_dev.clone()], list_out); diff --git a/crates/shirabe/tests/dependency_resolver/pool_builder_test.rs b/crates/shirabe/tests/dependency_resolver/pool_builder_test.rs index 87f02aa..0a6b0ca 100644 --- a/crates/shirabe/tests/dependency_resolver/pool_builder_test.rs +++ b/crates/shirabe/tests/dependency_resolver/pool_builder_test.rs @@ -38,13 +38,12 @@ fn load_package( let mut id: Option<i64> = None; // PHP: !empty($data['id']) - if let Some(id_val) = data.get("id") { - if let Some(i) = id_val.as_int() { - if i != 0 { - id = Some(i); - data.shift_remove("id"); - } - } + if let Some(id_val) = data.get("id") + && let Some(i) = id_val.as_int() + && i != 0 + { + id = Some(i); + data.shift_remove("id"); } let pkg = loader.load(data, None).unwrap(); @@ -267,10 +266,10 @@ fn get_package_result_set( if let Some(source_reference) = package.get_source_reference() { suffix = format!("#{}", source_reference); } - if let Some(repo) = package.get_repository() { - if repo.is::<LockArrayRepository>() { - suffix.push_str(" (locked)"); - } + if let Some(repo) = package.get_repository() + && repo.is::<LockArrayRepository>() + { + suffix.push_str(" (locked)"); } if let Some(alias) = package.as_alias() { @@ -460,18 +459,18 @@ fn run_test_pool_builder( // PHP: foreach ($packageRepos as $packages) for repo_entry in package_repos.as_list().unwrap() { // PHP: isset($packages['type']) - if let Some(repo_map) = repo_entry.as_array() { - if repo_map.contains_key("type") { - let repo = RepositoryFactory::create_repo( - io.clone(), - &config, - repo_map.clone(), - Some(&mut rm), - ) - .unwrap(); - repository_set.add_repository(repo).unwrap(); - continue; - } + if let Some(repo_map) = repo_entry.as_array() + && repo_map.contains_key("type") + { + let repo = RepositoryFactory::create_repo( + io.clone(), + &config, + repo_map.clone(), + Some(&mut rm), + ) + .unwrap(); + repository_set.add_repository(repo).unwrap(); + continue; } let repo = ArrayRepository::new(vec![]).unwrap(); diff --git a/crates/shirabe/tests/dependency_resolver/pool_test.rs b/crates/shirabe/tests/dependency_resolver/pool_test.rs index 2814aa6..b2bd0db 100644 --- a/crates/shirabe/tests/dependency_resolver/pool_test.rs +++ b/crates/shirabe/tests/dependency_resolver/pool_test.rs @@ -29,7 +29,7 @@ fn test_pool() { let mut pool = create_pool(vec![package.clone()]); assert!(same_packages( - &[package.clone()], + std::slice::from_ref(&package), &pool.what_provides("foo", None) )); assert!(same_packages(&[package], &pool.what_provides("foo", None))); diff --git a/crates/shirabe/tests/dependency_resolver/rule_set_iterator_test.rs b/crates/shirabe/tests/dependency_resolver/rule_set_iterator_test.rs index 9bb939b..44013aa 100644 --- a/crates/shirabe/tests/dependency_resolver/rule_set_iterator_test.rs +++ b/crates/shirabe/tests/dependency_resolver/rule_set_iterator_test.rs @@ -63,7 +63,7 @@ fn test_foreach() { rule_set_iterator.next(); } - let expected = vec![ + let expected = [ rules[&RuleSet::TYPE_REQUEST][0].clone(), rules[&RuleSet::TYPE_REQUEST][1].clone(), rules[&RuleSet::TYPE_LEARNED][0].clone(), diff --git a/crates/shirabe/tests/event_dispatcher/event_dispatcher_test.rs b/crates/shirabe/tests/event_dispatcher/event_dispatcher_test.rs index 978bcf7..9e048cf 100644 --- a/crates/shirabe/tests/event_dispatcher/event_dispatcher_test.rs +++ b/crates/shirabe/tests/event_dispatcher/event_dispatcher_test.rs @@ -20,7 +20,7 @@ use shirabe::util::platform::Platform; use shirabe::util::process_executor::{MockHandler, ProcessExecutor}; use shirabe_external_packages::symfony::console::output::output_interface; -use shirabe_php_shim::{PHP_EOL, PhpMixed}; +use shirabe_php_shim::PHP_EOL; use crate::process_executor_mock::{ProcessExecutorMockGuard, cmd, get_process_executor_mock}; diff --git a/crates/shirabe/tests/installer/binary_installer_test.rs b/crates/shirabe/tests/installer/binary_installer_test.rs index 48a6b6f..b26907d 100644 --- a/crates/shirabe/tests/installer/binary_installer_test.rs +++ b/crates/shirabe/tests/installer/binary_installer_test.rs @@ -104,7 +104,7 @@ fn run_install_and_exec_binary_with_full_compat(contents: &[u8]) { let mut proc = ProcessExecutor::new(None); let mut output = String::new(); - proc.execute(&format!("{}/binary arg", setup.bin_dir), &mut output, None) + proc.execute(format!("{}/binary arg", setup.bin_dir), &mut output, None) .unwrap(); assert_eq!("", proc.get_error_output()); assert_eq!("success arg", output); diff --git a/crates/shirabe/tests/installer/library_installer_test.rs b/crates/shirabe/tests/installer/library_installer_test.rs index 2e4883e..0796efe 100644 --- a/crates/shirabe/tests/installer/library_installer_test.rs +++ b/crates/shirabe/tests/installer/library_installer_test.rs @@ -49,7 +49,7 @@ struct SetUp { } fn set_up() -> SetUp { - let mut fs = Filesystem::new(None); + let fs = Filesystem::new(None); let root = TempDir::new().unwrap(); let root_dir = fs::canonicalize(root.path()) diff --git a/crates/shirabe/tests/io/console_io_test.rs b/crates/shirabe/tests/io/console_io_test.rs index f96aec1..9df851e 100644 --- a/crates/shirabe/tests/io/console_io_test.rs +++ b/crates/shirabe/tests/io/console_io_test.rs @@ -177,7 +177,7 @@ fn test_ask_and_validate() { // PHP asserts the helper receives a Question with a validator. Behaviorally, an always-true // validator passes the answer straight through. let (console_io, _output) = make_console_io_with_answer("answer\n"); - let validator: Box<dyn Fn(PhpMixed) -> anyhow::Result<PhpMixed>> = Box::new(|value| Ok(value)); + let validator: Box<dyn Fn(PhpMixed) -> anyhow::Result<PhpMixed>> = Box::new(Ok); let result = console_io .ask_and_validate( "Why?".to_string(), 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 2e614ee..2394af2 100644 --- a/crates/shirabe/tests/package/loader/validating_array_loader_test.rs +++ b/crates/shirabe/tests/package/loader/validating_array_loader_test.rs @@ -8,8 +8,7 @@ use shirabe::package::handle::PackageInterfaceHandle; use shirabe::package::loader::{InvalidPackageException, LoaderInterface, ValidatingArrayLoader}; use shirabe_php_shim::PhpMixed; -#[path = "../../common/test_case.rs"] -mod test_case; +use crate::test_case; fn s(v: &str) -> PhpMixed { PhpMixed::String(v.to_string()) @@ -1002,7 +1001,6 @@ fn test_load_warnings() { fn test_load_skips_warning_data_when_ignoring_errors() { for (mut cfg, _expected_warnings, must_check, expected_array) in warning_provider() { if !must_check { - assert!(true); continue; } let (internal_loader, calls) = MockLoader::new(); diff --git a/crates/shirabe/tests/repository/array_repository_test.rs b/crates/shirabe/tests/repository/array_repository_test.rs index 60bea16..1612b7c 100644 --- a/crates/shirabe/tests/repository/array_repository_test.rs +++ b/crates/shirabe/tests/repository/array_repository_test.rs @@ -49,7 +49,7 @@ fn reprs(results: &[SearchResult]) -> Vec<(String, Option<String>, Abandoned)> { #[test] fn test_add_package() { - let mut repo = ArrayRepository::new(vec![]).unwrap(); + let repo = ArrayRepository::new(vec![]).unwrap(); repo.add_package(get_package("foo", "1")).unwrap(); assert_eq!(1, repo.count().unwrap()); @@ -75,7 +75,7 @@ fn test_remove_package() { #[test] fn test_has_package() { - let mut repo = ArrayRepository::new(vec![]).unwrap(); + let repo = ArrayRepository::new(vec![]).unwrap(); repo.add_package(get_package("foo", "1")).unwrap(); repo.add_package(get_package("bar", "2")).unwrap(); @@ -102,7 +102,7 @@ fn test_find_packages() { #[test] #[ignore] fn test_automatically_add_aliased_package_but_not_remove() { - let mut repo = ArrayRepository::new(vec![]).unwrap(); + let repo = ArrayRepository::new(vec![]).unwrap(); let package = get_package("foo", "1"); let alias = get_alias_package(&package, "2"); diff --git a/crates/shirabe/tests/repository/vcs/forgejo_driver_test.rs b/crates/shirabe/tests/repository/vcs/forgejo_driver_test.rs index 1f9ae53..2e36833 100644 --- a/crates/shirabe/tests/repository/vcs/forgejo_driver_test.rs +++ b/crates/shirabe/tests/repository/vcs/forgejo_driver_test.rs @@ -10,7 +10,7 @@ use shirabe::io::null_io::NullIO; use shirabe::repository::vcs::ForgejoDriver; use shirabe::util::filesystem::Filesystem; use shirabe::util::http_downloader::{HttpDownloader, HttpDownloaderMockHandler}; -use shirabe::util::process_executor::{MockHandler, ProcessExecutor}; +use shirabe::util::process_executor::MockHandler; use shirabe_php_shim::PhpMixed; use tempfile::TempDir; diff --git a/crates/shirabe/tests/repository/vcs/gitlab_driver_test.rs b/crates/shirabe/tests/repository/vcs/gitlab_driver_test.rs index e21835d..437617b 100644 --- a/crates/shirabe/tests/repository/vcs/gitlab_driver_test.rs +++ b/crates/shirabe/tests/repository/vcs/gitlab_driver_test.rs @@ -12,9 +12,7 @@ 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, expect_full, get_http_downloader_mock, -}; +use crate::http_downloader_mock::{HttpDownloaderMockGuard, expect_full, get_http_downloader_mock}; use crate::process_executor_mock::{ProcessExecutorMockGuard, get_process_executor_mock}; // Mirrors GitLabDriverTest::setUp's `gitlab-domains` configuration. diff --git a/crates/shirabe/tests/repository/vcs_repository_test.rs b/crates/shirabe/tests/repository/vcs_repository_test.rs index 279db04..e3b0e84 100644 --- a/crates/shirabe/tests/repository/vcs_repository_test.rs +++ b/crates/shirabe/tests/repository/vcs_repository_test.rs @@ -26,10 +26,7 @@ struct SetUp { // ref: VcsRepositoryTest::initialize. Builds a fixture git repository on disk by shelling out to // git. Returns None when git is unavailable (mirroring markTestSkipped). fn set_up() -> Option<SetUp> { - if which_git().is_none() { - // 'This test needs a git binary in the PATH to be able to run' - return None; - } + which_git()?; let composer_home = TempDir::new().unwrap(); let git_repo = TempDir::new().unwrap(); diff --git a/crates/shirabe/tests/util/auth_helper_test.rs b/crates/shirabe/tests/util/auth_helper_test.rs index 133fd75..b760fc8 100644 --- a/crates/shirabe/tests/util/auth_helper_test.rs +++ b/crates/shirabe/tests/util/auth_helper_test.rs @@ -470,7 +470,7 @@ fn expected_auth_setting(username: &str, password: &str) -> PhpMixed { #[test] fn test_store_auth_automatically() { - let mut f = set_up(); + let f = set_up(); let origin = "github.com"; expects_authentication(&f.io, origin, "my_username", "my_password"); @@ -497,7 +497,7 @@ fn test_store_auth_automatically() { #[test] fn test_store_auth_with_prompt_yes_answer() { - let mut f = set_up(); + let f = set_up(); let origin = "github.com"; expects_authentication(&f.io, origin, "my_username", "my_password"); let config_source_name = "https://api.gitlab.com/source"; @@ -536,7 +536,7 @@ fn test_store_auth_with_prompt_yes_answer() { #[test] fn test_store_auth_with_prompt_no_answer() { - let mut f = set_up(); + let f = set_up(); let origin = "github.com"; let config_source_name = "https://api.gitlab.com/source"; diff --git a/crates/shirabe/tests/util/filesystem_test.rs b/crates/shirabe/tests/util/filesystem_test.rs index e0bb46b..2e160e8 100644 --- a/crates/shirabe/tests/util/filesystem_test.rs +++ b/crates/shirabe/tests/util/filesystem_test.rs @@ -5,9 +5,7 @@ // place of TestCase::getUniqueTmpDirectory, which is not ported. use shirabe::util::filesystem::Filesystem; use shirabe::util::platform::Platform; -use shirabe_php_shim::{ - dirname, file_exists, file_put_contents, is_dir, is_file, mkdir, symlink, touch, -}; +use shirabe_php_shim::{file_exists, file_put_contents, is_dir, mkdir, symlink, touch}; // PHP's setUp/tearDown build workingDir/testFile under TestCase::getUniqueTmpDirectory; the // on-disk tests below instead create their own tempfile::TempDir inline, so no shared fixture diff --git a/crates/shirabe/tests/util/gitlab_test.rs b/crates/shirabe/tests/util/gitlab_test.rs index 5a91415..ebf7c08 100644 --- a/crates/shirabe/tests/util/gitlab_test.rs +++ b/crates/shirabe/tests/util/gitlab_test.rs @@ -7,7 +7,7 @@ use shirabe::config::{Config, ConfigSourceInterface}; use shirabe::io::IOInterface; use shirabe::io::io_interface; use shirabe::util::GitLab; -use shirabe::util::http_downloader::{HttpDownloader, HttpDownloaderMockHandler}; +use shirabe::util::http_downloader::HttpDownloaderMockHandler; use shirabe_php_shim::PhpMixed; use crate::config_stub::ConfigStubBuilder; diff --git a/crates/shirabe/tests/util/perforce_test.rs b/crates/shirabe/tests/util/perforce_test.rs index 4f3cb58..482094f 100644 --- a/crates/shirabe/tests/util/perforce_test.rs +++ b/crates/shirabe/tests/util/perforce_test.rs @@ -8,7 +8,7 @@ use serial_test::serial; use shirabe::io::{IOInterface, NullIO}; use shirabe::util::Perforce; use shirabe::util::filesystem::Filesystem; -use shirabe::util::process_executor::{MockExpectation, MockHandler, ProcessExecutor}; +use shirabe::util::process_executor::{MockHandler, ProcessExecutor}; use shirabe_php_shim::PhpMixed; use crate::io_stub::IOStub; diff --git a/crates/shirabe/tests/util/stream_context_factory_test.rs b/crates/shirabe/tests/util/stream_context_factory_test.rs index ad123aa..284077b 100644 --- a/crates/shirabe/tests/util/stream_context_factory_test.rs +++ b/crates/shirabe/tests/util/stream_context_factory_test.rs @@ -324,16 +324,16 @@ fn test_ssl_proxy() { )]); assert_eq!(expected_options, options); } else { - match StreamContextFactory::get_context( - "http://example.org", - IndexMap::new(), - IndexMap::new(), - ) { - // The catch in PHP asserts the exception is a TransportException; the return type - // here already guarantees that. - Ok(_) => panic!(), - Err(_) => {} - } + // The catch in PHP asserts the exception is a TransportException; the return type + // here already guarantees that. + assert!( + StreamContextFactory::get_context( + "http://example.org", + IndexMap::new(), + IndexMap::new(), + ) + .is_err() + ); } } } @@ -351,7 +351,7 @@ fn test_ensure_thatfix_http_header_field_moves_content_type_to_end_of_options() ), )]), )]); - let expected_header = vec![ + let expected_header = [ s("User-agent: foo"), s("X-Foo: bar"), s("Authorization: Basic aW52YWxpZA=="), |