diff options
Diffstat (limited to 'crates/shirabe/tests')
| -rw-r--r-- | crates/shirabe/tests/dependency_resolver/rule_test.rs | 9 | ||||
| -rw-r--r-- | crates/shirabe/tests/package/version/version_selector_test.rs | 7 |
2 files changed, 4 insertions, 12 deletions
diff --git a/crates/shirabe/tests/dependency_resolver/rule_test.rs b/crates/shirabe/tests/dependency_resolver/rule_test.rs index 9526bf39..4cd11139 100644 --- a/crates/shirabe/tests/dependency_resolver/rule_test.rs +++ b/crates/shirabe/tests/dependency_resolver/rule_test.rs @@ -7,7 +7,7 @@ use shirabe::dependency_resolver::{ }; use shirabe::package::Link; use shirabe::repository::RepositorySet; -use shirabe_php_shim::{PHP_VERSION_ID, hash_raw}; +use shirabe_php_shim::hash_raw; use shirabe_semver::constraint::MatchAllConstraint; fn root_require_reason() -> ReasonData { @@ -29,12 +29,7 @@ fn generic_rule(literals: Vec<i64>) -> Rule { fn test_get_hash() { let rule = generic_rule(vec![123]); - let algo = if PHP_VERSION_ID > 80100 { - "xxh3" - } else { - "sha1" - }; - let binary = hash_raw(algo, "123"); + let binary = hash_raw("xxh3", "123"); let hash = i32::from_ne_bytes(binary[..4].try_into().unwrap()) as i64; assert_eq!(Some(hash), rule.get_hash().unwrap().as_int()); diff --git a/crates/shirabe/tests/package/version/version_selector_test.rs b/crates/shirabe/tests/package/version/version_selector_test.rs index 8a3e44a5..9792e0bf 100644 --- a/crates/shirabe/tests/package/version/version_selector_test.rs +++ b/crates/shirabe/tests/package/version/version_selector_test.rs @@ -16,7 +16,6 @@ use shirabe::package::version::version_parser::VersionParser; use shirabe::repository::PlatformRepository; use shirabe::repository::RepositorySetInterface; use shirabe_php_shim::PhpMixed; -use shirabe_php_shim::{PHP_MAJOR_VERSION, PHP_MINOR_VERSION, PHP_RELEASE_VERSION}; use shirabe_semver::constraint::AnyConstraint; use shirabe_symfony_console::output::output_interface; @@ -535,10 +534,8 @@ fn test_false_returned_on_no_packages() { #[test] fn test_find_recommended_require_version() { - let php_version = format!( - "{}.{}.{}", - PHP_MAJOR_VERSION, PHP_MINOR_VERSION, PHP_RELEASE_VERSION - ); + let php = shirabe_php_rpc::get_php_version(); + let php_version = format!("{}.{}.{}", php.major, php.minor, php.release); // real version, expected recommendation, [branch-alias], [pkg name] let cases: Vec<(String, &str, Option<&str>, &str)> = vec