coffee/googletest
1
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-12-06 16:57:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

FloatingEqMatcher supports conversion to const float types

Browse Source
This commit is contained in:
Nicholas Brekhus 2024-02-08 12:23:48 -08:00
parent b75ecf1bed
commit 8ffc42998b
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
googlemock/include/gmock/gmock-matchers.h
View File

@ -1761,9 +1761,15 @@ class FloatingEqMatcher {
const FloatType max_abs_error_; const FloatType max_abs_error_;
}; };
// The following 3 type conversion operators allow FloatEq(expected) and // The following 4 type conversion operators allow FloatEq(expected) and
// NanSensitiveFloatEq(expected) to be used as a Matcher<float>, a // NanSensitiveFloatEq(expected) to be used as a Matcher<const float>,
// Matcher<const float&>, or a Matcher<float&>, but nothing else. // a Matcher<float>, a Matcher<const float&>, or a Matcher<float&>,
// but nothing else.
operator Matcher<const FloatType>() const {
return MakeMatcher(
new Impl<const FloatType>(expected_, nan_eq_nan_, max_abs_error_));
}
operator Matcher<FloatType>() const { operator Matcher<FloatType>() const {
return MakeMatcher( return MakeMatcher(
new Impl<FloatType>(expected_, nan_eq_nan_, max_abs_error_)); new Impl<FloatType>(expected_, nan_eq_nan_, max_abs_error_));

5
googlemock/test/gmock-matchers-misc_test.cc
View File

@ -696,6 +696,11 @@ TEST(OptionalTest, DescribesSelf) {
EXPECT_EQ("value is equal to 1", Describe(m)); EXPECT_EQ("value is equal to 1", Describe(m));
} }
TEST(OptionalTest, WorksWithConstDouble) {
const SampleOptional<const double> opt(3.14159);
EXPECT_THAT(opt, Optional(DoubleEq(3.14159)));
}
TEST(OptionalTest, ExplainsSelf) { TEST(OptionalTest, ExplainsSelf) {
const Matcher<SampleOptional<int>> m = Optional(Eq(1)); const Matcher<SampleOptional<int>> m = Optional(Eq(1));
EXPECT_EQ("whose value 1 matches", Explain(m, SampleOptional<int>(1))); EXPECT_EQ("whose value 1 matches", Explain(m, SampleOptional<int>(1)));