Skip to content

Change NearMatcher to support references to the target type. #628

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 22, 2025
Merged

Change NearMatcher to support references to the target type. #628

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 17 additions & 4 deletions googletest/src/matchers/near_matcher.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use crate::{
matcher::{Matcher, MatcherBase, MatcherResult},
};
use num_traits::{Float, FloatConst};
use std::fmt::Debug;
use std::{borrow::Borrow, fmt::Debug};

/// Matches a value equal within `max_abs_error` of `expected`.
///
Expand Down Expand Up @@ -168,13 +168,13 @@ impl<T: Debug> NearMatcher<T> {
}
}

impl<T: Debug + Float + Copy> Matcher<T> for NearMatcher<T> {
impl<T: Borrow<F> + Debug + Copy, F: Debug + Float> Matcher<T> for NearMatcher<F> {
fn matches(&self, actual: T) -> MatcherResult {
if self.nans_are_equal && self.expected.is_nan() && actual.is_nan() {
if self.nans_are_equal && self.expected.is_nan() && actual.borrow().is_nan() {
return MatcherResult::Match;
}

let delta = actual - self.expected;
let delta = *actual.borrow() - self.expected;
if delta >= -self.max_abs_error && delta <= self.max_abs_error {
MatcherResult::Match
} else {
Expand Down Expand Up @@ -347,4 +347,17 @@ mod tests {
fn approx_eq_does_not_match_distant_number() -> Result<()> {
verify_that!(0.0f64, not(approx_eq(1.0f64)))
}

#[test]
fn approx_eq_supports_ref() -> Result<()> {
verify_that!(&0.0f64, approx_eq(0.0f64))
}

#[test]
fn approx_eq_supports_container_matchers() -> Result<()> {
verify_that!(
vec![1., 2., 3.],
unordered_elements_are![approx_eq(2.), approx_eq(3.), approx_eq(1.)]
)
}
}
Loading