diff options
Diffstat (limited to 'crates/shirabe/tests/dependency_resolver')
| -rw-r--r-- | crates/shirabe/tests/dependency_resolver/pool_builder_test.rs | 5 | ||||
| -rw-r--r-- | crates/shirabe/tests/dependency_resolver/pool_optimizer_test.rs | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/crates/shirabe/tests/dependency_resolver/pool_builder_test.rs b/crates/shirabe/tests/dependency_resolver/pool_builder_test.rs index a4d118ee..27359fa3 100644 --- a/crates/shirabe/tests/dependency_resolver/pool_builder_test.rs +++ b/crates/shirabe/tests/dependency_resolver/pool_builder_test.rs @@ -19,8 +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_pcre::preg::Preg; -use shirabe_php_shim::{PhpMixed, php_regex, preg_split_delim_capture}; +use shirabe_php_shim::{PhpMixed, php_regex, preg_match2, preg_split_delim_capture}; use std::path::PathBuf; /// Maps the PHP `$loadPackage` closure: pops the optional `id` from the data, loads the @@ -138,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::is_match(php_regex!(r"/\.test$/"), &file) { + if preg_match2(php_regex!(r"/\.test$/"), &file, 0).is_none() { continue; } diff --git a/crates/shirabe/tests/dependency_resolver/pool_optimizer_test.rs b/crates/shirabe/tests/dependency_resolver/pool_optimizer_test.rs index 8c08e1c0..cac8189d 100644 --- a/crates/shirabe/tests/dependency_resolver/pool_optimizer_test.rs +++ b/crates/shirabe/tests/dependency_resolver/pool_optimizer_test.rs @@ -11,8 +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_pcre::preg::Preg; -use shirabe_php_shim::{PhpMixed, php_regex, preg_split_delim_capture}; +use shirabe_php_shim::{PhpMixed, php_regex, preg_match2, preg_split_delim_capture}; use std::path::PathBuf; fn load_package(package_data: &PhpMixed) -> BasePackageHandle { @@ -141,7 +140,7 @@ fn provide_integration_tests() -> IndexMap< for file in files { let file = file.to_str().unwrap().to_string(); - if !Preg::is_match(php_regex!(r"/\.test$/"), &file) { + if preg_match2(php_regex!(r"/\.test$/"), &file, 0).is_none() { continue; } |
