diff options
Diffstat (limited to 'crates/shirabe/tests')
4 files changed, 10 insertions, 8 deletions
diff --git a/crates/shirabe/tests/common/io_mock.rs b/crates/shirabe/tests/common/io_mock.rs index a6a407a3..5a5f35b6 100644 --- a/crates/shirabe/tests/common/io_mock.rs +++ b/crates/shirabe/tests/common/io_mock.rs @@ -5,7 +5,7 @@ use shirabe::io::buffer_io::BufferIO; use shirabe::io::io_interface; use shirabe::io::{IOInterface, IOInterfaceImmutable, IOInterfaceMutable}; use shirabe::util::platform::Platform; -use shirabe_php_shim::{PHP_EOL, PhpMixed, php_regex, preg_match, preg_quote, preg_split}; +use shirabe_php_shim::{PHP_EOL, PhpMixed, php_regex, preg_is_match, preg_quote, preg_split}; use shirabe_symfony_console::output::output_interface; use std::collections::VecDeque; @@ -166,7 +166,7 @@ impl IOMock { }; while let Some(line) = lines.pop_front() { - if preg_match(&pattern, &line).is_some() { + if preg_is_match(&pattern, &line) { continue 'expects; } diff --git a/crates/shirabe/tests/dependency_resolver/pool_builder_test.rs b/crates/shirabe/tests/dependency_resolver/pool_builder_test.rs index e04e2ca9..a9b59596 100644 --- a/crates/shirabe/tests/dependency_resolver/pool_builder_test.rs +++ b/crates/shirabe/tests/dependency_resolver/pool_builder_test.rs @@ -19,7 +19,7 @@ use shirabe::repository::handle::{LockArrayRepositoryHandle, RepositoryInterface use shirabe::repository::lock_array_repository::LockArrayRepository; use shirabe::repository::repository_factory::RepositoryFactory; use shirabe::repository::repository_set::{RepositorySet, RootAliasInput}; -use shirabe_php_shim::{PhpMixed, php_regex, preg_match, preg_split_delim_capture}; +use shirabe_php_shim::{PhpMixed, php_regex, preg_is_match, preg_split_delim_capture}; use std::path::PathBuf; /// Maps the PHP `$loadPackage` closure: pops the optional `id` from the data, loads the @@ -137,7 +137,7 @@ fn get_integration_tests(fixtures_dir: &std::path::Path) -> IndexMap<String, Int for file in files { let file = file.to_str().unwrap().to_string(); - if preg_match(php_regex!(r"/\.test$/"), &file).is_none() { + if !preg_is_match(php_regex!(r"/\.test$/"), &file) { continue; } diff --git a/crates/shirabe/tests/dependency_resolver/pool_optimizer_test.rs b/crates/shirabe/tests/dependency_resolver/pool_optimizer_test.rs index e40d5257..b84d152e 100644 --- a/crates/shirabe/tests/dependency_resolver/pool_optimizer_test.rs +++ b/crates/shirabe/tests/dependency_resolver/pool_optimizer_test.rs @@ -11,7 +11,7 @@ use shirabe::package::loader::{ArrayLoader, LoaderInterface}; use shirabe::package::version::version_parser::VersionParser; use shirabe::repository::handle::LockArrayRepositoryHandle; use shirabe::repository::lock_array_repository::LockArrayRepository; -use shirabe_php_shim::{PhpMixed, php_regex, preg_match, preg_split_delim_capture}; +use shirabe_php_shim::{PhpMixed, php_regex, preg_is_match, preg_split_delim_capture}; use std::path::PathBuf; fn load_package(package_data: &PhpMixed) -> BasePackageHandle { @@ -140,7 +140,7 @@ fn provide_integration_tests() -> IndexMap< for file in files { let file = file.to_str().unwrap().to_string(); - if preg_match(php_regex!(r"/\.test$/"), &file).is_none() { + if !preg_is_match(php_regex!(r"/\.test$/"), &file) { continue; } diff --git a/crates/shirabe/tests/installer_test.rs b/crates/shirabe/tests/installer_test.rs index 606baacc..05776557 100644 --- a/crates/shirabe/tests/installer_test.rs +++ b/crates/shirabe/tests/installer_test.rs @@ -42,7 +42,9 @@ use shirabe::util::r#loop::Loop; use shirabe::util::platform::Platform; use shirabe::util::process_executor::ProcessExecutor; use shirabe_class_map_generator::class_map::ClassMap; -use shirabe_php_shim::{PhpMixed, php_regex, preg_match, preg_replace, preg_split_delim_capture}; +use shirabe_php_shim::{ + PhpMixed, php_regex, preg_is_match, preg_match, preg_replace, preg_split_delim_capture, +}; use shirabe_semver::VersionParser; use shirabe_semver::constraint::AnyConstraint; use shirabe_symfony_console::command::Command as SymfonyCommand; @@ -691,7 +693,7 @@ fn load_integration_tests(path: &str) -> Vec<IntegrationCase> { return; } if let Some(url) = repo.get("url").and_then(|u| u.as_str()) - && preg_match(php_regex!(r"{^file://[^/]}"), url).is_some() + && preg_is_match(php_regex!(r"{^file://[^/]}"), url) { let new_url = format!("file://{}/{}", fixtures_str, &url[7..]); repo["url"] = serde_json::Value::String(new_url); |