Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 28 additions & 2 deletions src/find/matchers/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,7 @@ impl Matcher for Box<dyn Matcher> {
}
}

#[derive(Debug, Eq, PartialEq)]
pub enum ComparableValue {
MoreThan(u64),
EqualTo(u64),
Expand Down Expand Up @@ -311,7 +312,7 @@ fn convert_arg_to_comparable_value(
option_name: &str,
value_as_string: &str,
) -> Result<ComparableValue, Box<dyn Error>> {
let re = Regex::new(r"^([+-]?)(\d+)$")?;
let re = Regex::new(r"^([-+]?)[-+]?(\d+)$")?;
if let Some(groups) = re.captures(value_as_string) {
if let Ok(val) = groups[2].parse::<u64>() {
return Ok(match &groups[1] {
Expand All @@ -331,7 +332,7 @@ fn convert_arg_to_comparable_value_and_suffix(
option_name: &str,
value_as_string: &str,
) -> Result<(ComparableValue, String), Box<dyn Error>> {
let re = Regex::new(r"([+-]?)(\d+)(.*)$")?;
let re = Regex::new(r"([-+]?)[-+]?(\d+)(.*)$")?;
if let Some(groups) = re.captures(value_as_string) {
if let Ok(val) = groups[2].parse::<u64>() {
return Ok((
Expand Down Expand Up @@ -1681,6 +1682,31 @@ mod tests {
}
}

#[test]
fn convert_arg_to_comparable_value_test() {
assert_eq!(
convert_arg_to_comparable_value("test", "10").unwrap(),
ComparableValue::EqualTo(10),
);
assert_eq!(
convert_arg_to_comparable_value("test", "+10").unwrap(),
ComparableValue::MoreThan(10),
);
assert_eq!(
convert_arg_to_comparable_value("test", "-10").unwrap(),
ComparableValue::LessThan(10),
);

assert_eq!(
convert_arg_to_comparable_value("test", "-+10").unwrap(),
ComparableValue::LessThan(10),
);
assert_eq!(
convert_arg_to_comparable_value("test", "++10").unwrap(),
ComparableValue::MoreThan(10),
);
}

#[test]
fn convert_exception_arg_to_comparable_value_test() {
let exception_args = ["1%2", "1%2%3", "1a2", "1%2a", "abc", "-", "+", "%"];
Expand Down
Loading