organicmaps/googletest
13
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-04-04 21:15:03 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Merge d38cdaefc2 into 52204f78f9

Browse source
This commit is contained in:
Daniel 2025-03-26 13:38:32 -07:00 • committed by GitHub
commit b67bfbc95f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 145 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
googletest/include/gtest/gtest.h
View file

@ -1601,6 +1601,29 @@ AssertionResult CmpHelperFloatingPointEQ(const char* lhs_expression,
false);
}
template <typename RawType>
AssertionResult CmpHelperFloatingPointNE(const char* lhs_expression,
const char* rhs_expression,
RawType lhs_value, RawType rhs_value) {
const FloatingPoint<RawType> lhs(lhs_value), rhs(rhs_value);
if (!lhs.AlmostEquals(rhs)) {
return AssertionSuccess();
}
::std::stringstream lhs_ss;
lhs_ss.precision(std::numeric_limits<RawType>::digits10 + 2);
lhs_ss << lhs_value;
::std::stringstream rhs_ss;
rhs_ss.precision(std::numeric_limits<RawType>::digits10 + 2);
rhs_ss << rhs_value;
return NeFailure(lhs_expression, rhs_expression,
StringStreamToString(&lhs_ss), StringStreamToString(&rhs_ss),
false);
}
// Helper function for implementing ASSERT_NEAR.
//
// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
@ -1998,6 +2021,22 @@ class TestWithParam : public Test, public WithParamInterface<T> {};
ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ<double>, \
val1, val2)
#define EXPECT_FLOAT_NE(val1, val2) \
EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointNE<float>, \
val1, val2)
#define EXPECT_DOUBLE_NE(val1, val2) \
EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointNE<double>, \
val1, val2)
#define ASSERT_FLOAT_NE(val1, val2) \
ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointNE<float>, \
val1, val2)
#define ASSERT_DOUBLE_NE(val1, val2) \
ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointNE<double>, \
val1, val2)
#define EXPECT_NEAR(val1, val2, abs_error) \
EXPECT_PRED_FORMAT3(::testing::internal::DoubleNearPredFormat, val1, val2, \
abs_error)

6
googletest/include/gtest/internal/gtest-internal.h
View file

@ -207,6 +207,12 @@ GTEST_API_ AssertionResult EqFailure(const char* expected_expression,
const std::string& actual_value,
bool ignoring_case);
GTEST_API_ AssertionResult NeFailure(const char* expected_expression,
const char* actual_expression,
const std::string& expected_value,
const std::string& actual_value,
bool ignoring_case);
// Constructs a failure message for Boolean assertions such as EXPECT_TRUE.
GTEST_API_ std::string GetBoolAssertionFailureMessage(
const AssertionResult& assertion_result, const char* expression_text,

31
googletest/src/gtest.cc
View file

@ -1658,6 +1658,37 @@ AssertionResult EqFailure(const char* lhs_expression,
return AssertionFailure() << msg;
}
AssertionResult NeFailure(const char* lhs_expression,
const char* rhs_expression,
const std::string& lhs_value,
const std::string& rhs_value, bool ignoring_case) {
Message msg;
msg << "Expected inequality of these values:";
msg << "\n " << lhs_expression;
if (lhs_value != lhs_expression) {
msg << "\n Which is: " << lhs_value;
}
msg << "\n " << rhs_expression;
if (rhs_value != rhs_expression) {
msg << "\n Which is: " << rhs_value;
}
if (ignoring_case) {
msg << "\nIgnoring case";
}
if (!lhs_value.empty() && !rhs_value.empty()) {
const std::vector<std::string> lhs_lines = SplitEscapedString(lhs_value);
const std::vector<std::string> rhs_lines = SplitEscapedString(rhs_value);
if (lhs_lines.size() > 1 || rhs_lines.size() > 1) {
msg << "\nWith diff:\n"
<< edit_distance::CreateUnifiedDiff(lhs_lines, rhs_lines);
}
}
return AssertionFailure() << msg;
}
// Constructs a failure message for Boolean assertions such as EXPECT_TRUE.
std::string GetBoolAssertionFailureMessage(
const AssertionResult& assertion_result, const char* expression_text,

69
googletest/test/gtest_unittest.cc
View file

@ -2826,6 +2826,10 @@ TEST_F(FloatTest, Zeros) {
EXPECT_FLOAT_EQ(0.0, -0.0);
EXPECT_NONFATAL_FAILURE(EXPECT_FLOAT_EQ(-0.0, 1.0), "1.0");
EXPECT_FATAL_FAILURE(ASSERT_FLOAT_EQ(0.0, 1.5), "1.5");
EXPECT_FLOAT_NE(-0.0, 1.0);
EXPECT_NONFATAL_FAILURE(EXPECT_FLOAT_NE(-0.0,0.0), "0.0");
EXPECT_FATAL_FAILURE(ASSERT_FLOAT_NE(-0.0, 0.0), "0.0");
}
// Tests comparing numbers close to 0.
@ -2851,6 +2855,23 @@ TEST_F(FloatTest, AlmostZeros) {
ASSERT_FLOAT_EQ(v.close_to_positive_zero, v.further_from_negative_zero);
},
"v.further_from_negative_zero");
EXPECT_FLOAT_NE(v.close_to_positive_zero, v.further_from_negative_zero);
EXPECT_FATAL_FAILURE(
{ // NOLINT
ASSERT_FLOAT_NE(0.0, v.close_to_positive_zero);
ASSERT_FLOAT_NE(v.close_to_negative_zero, v.close_to_positive_zero);
},
"v.close_to_positive_zero");
EXPECT_FATAL_FAILURE(
{ // NOLINT
ASSERT_FLOAT_NE(-0.0, v.close_to_negative_zero);
ASSERT_FLOAT_NE(v.close_to_positive_zero, v.close_to_negative_zero);
},
"v.close_to_negative_zero");
}
// Tests comparing numbers close to each other.
@ -2858,11 +2879,17 @@ TEST_F(FloatTest, SmallDiff) {
EXPECT_FLOAT_EQ(1.0, values_.close_to_one);
EXPECT_NONFATAL_FAILURE(EXPECT_FLOAT_EQ(1.0, values_.further_from_one),
"values_.further_from_one");
EXPECT_FLOAT_NE(1.0, values_.further_from_one);
EXPECT_NONFATAL_FAILURE(EXPECT_FLOAT_NE(1.0, values_.close_to_one),
"values_.close_to_one");
}
// Tests comparing numbers far apart.
TEST_F(FloatTest, LargeDiff) {
EXPECT_NONFATAL_FAILURE(EXPECT_FLOAT_EQ(2.5, 3.0), "3.0");
EXPECT_FLOAT_NE(2.5, 3.5);
}
// Tests comparing with infinity.
@ -2920,6 +2947,12 @@ TEST_F(FloatTest, Commutative) {
// We already tested EXPECT_FLOAT_EQ(1.0, values_.further_from_one).
EXPECT_NONFATAL_FAILURE(EXPECT_FLOAT_EQ(values_.further_from_one, 1.0),
"1.0");
// We already tested EXPECT_FLOAT_NE(1.0, values_.close_to_one).
EXPECT_NONFATAL_FAILURE(EXPECT_FLOAT_NE(values_.close_to_one, 1.0), "1.0");
// We already tested EXPECT_FLOAT_NE(1.0, values_.further_from_one).
EXPECT_FLOAT_NE(values_.further_from_one, 1.0);
}
// Tests EXPECT_NEAR.
@ -3007,6 +3040,10 @@ TEST_F(DoubleTest, Zeros) {
EXPECT_DOUBLE_EQ(0.0, -0.0);
EXPECT_NONFATAL_FAILURE(EXPECT_DOUBLE_EQ(-0.0, 1.0), "1.0");
EXPECT_FATAL_FAILURE(ASSERT_DOUBLE_EQ(0.0, 1.0), "1.0");
EXPECT_DOUBLE_NE(-0.0, 1.0);
EXPECT_NONFATAL_FAILURE(EXPECT_DOUBLE_NE(-0.0, 0.0), "0.0");
EXPECT_FATAL_FAILURE(ASSERT_DOUBLE_NE(-0.0, 0.0), "0.0");
}
// Tests comparing numbers close to 0.
@ -3033,6 +3070,26 @@ TEST_F(DoubleTest, AlmostZeros) {
v.further_from_negative_zero);
},
"v.further_from_negative_zero");
EXPECT_DOUBLE_NE(v.close_to_positive_zero, v.further_from_negative_zero);
EXPECT_FATAL_FAILURE(
{ // NOLINT
ASSERT_DOUBLE_NE(0.0,
v.close_to_positive_zero);
ASSERT_DOUBLE_NE(v.close_to_negative_zero,
v.close_to_positive_zero);
},
"v.close_to_positive_zero");
EXPECT_FATAL_FAILURE(
{ // NOLINT
ASSERT_DOUBLE_NE(-0.0,
v.close_to_negative_zero);
ASSERT_DOUBLE_NE(v.close_to_positive_zero,
v.close_to_negative_zero);
},
"v.close_to_negative_zero");
}
// Tests comparing numbers close to each other.
@ -3040,11 +3097,17 @@ TEST_F(DoubleTest, SmallDiff) {
EXPECT_DOUBLE_EQ(1.0, values_.close_to_one);
EXPECT_NONFATAL_FAILURE(EXPECT_DOUBLE_EQ(1.0, values_.further_from_one),
"values_.further_from_one");
EXPECT_DOUBLE_NE(1.0, values_.further_from_one);
EXPECT_NONFATAL_FAILURE(EXPECT_DOUBLE_NE(1.0, values_.close_to_one),
"values_.close_to_one");
}
// Tests comparing numbers far apart.
TEST_F(DoubleTest, LargeDiff) {
EXPECT_NONFATAL_FAILURE(EXPECT_DOUBLE_EQ(2.0, 3.0), "3.0");
EXPECT_DOUBLE_NE(2.0, 3.0);
}
// Tests comparing with infinity.
@ -3097,6 +3160,12 @@ TEST_F(DoubleTest, Commutative) {
// We already tested EXPECT_DOUBLE_EQ(1.0, values_.further_from_one).
EXPECT_NONFATAL_FAILURE(EXPECT_DOUBLE_EQ(values_.further_from_one, 1.0),
"1.0");
// We already tested EXPECT_DOUBLE_NE(1.0, values_.close_to_one).
EXPECT_NONFATAL_FAILURE(EXPECT_DOUBLE_NE(values_.close_to_one, 1.0), "1.0");
// We already tested EXPECT_FLOAT_NE(1.0, values_.further_from_one).
EXPECT_DOUBLE_NE(values_.further_from_one, 1.0);
}
// Tests EXPECT_NEAR.