From 3aa538cbfcc65989721632d2a8d79539512ebdb7 Mon Sep 17 00:00:00 2001
From: Muhammad Hilman Beyri <hilmanbeyri@gmail.com>
Date: Sun, 12 Jan 2020 16:53:09 -0500
Subject: [PATCH] fix unit test failure on NoShortCircuitOnFailure and
DetectsFlakyShortCircuit when GTEST_HAS_RTTI is 1
---
googlemock/test/gmock-matchers_test.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/googlemock/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc
index e6e8c8f4..98b814ba 100644
--- a/googlemock/test/gmock-matchers_test.cc
+++ b/googlemock/test/gmock-matchers_test.cc
@@ -6885,7 +6885,7 @@ TEST_F(PredicateFormatterFromMatcherTest, NoShortCircuitOnFailure) {
EXPECT_FALSE(result); // Implicit cast to bool.
std::string expect =
"Value of: dummy-name\nExpected: [DescribeTo]\n"
- " Actual: 1, [MatchAndExplain]";
+ " Actual: 1" + OfType(internal::GetTypeName<Behavior>()) + ", [MatchAndExplain]";
EXPECT_EQ(expect, result.message());
}
@@ -6896,7 +6896,7 @@ TEST_F(PredicateFormatterFromMatcherTest, DetectsFlakyShortCircuit) {
"Value of: dummy-name\nExpected: [DescribeTo]\n"
" The matcher failed on the initial attempt; but passed when rerun to "
"generate the explanation.\n"
- " Actual: 2, [MatchAndExplain]";
+ " Actual: 2" + OfType(internal::GetTypeName<Behavior>()) + ", [MatchAndExplain]";
EXPECT_EQ(expect, result.message());
}