aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock
diff options
context:
space:
mode:
authorMuhammad Hilman Beyri <hilmanbeyri@gmail.com>2020-01-12 16:53:09 -0500
committerMuhammad Hilman Beyri <hilmanbeyri@gmail.com>2020-01-12 16:53:09 -0500
commit3aa538cbfcc65989721632d2a8d79539512ebdb7 (patch)
treeb38b2629744ae0a05465a7413d3b314cc7aa23f1 /googlemock
parentd854bd6acc47f7f6e168007d58b5f509e4981b36 (diff)
downloadgoogletest-3aa538cbfcc65989721632d2a8d79539512ebdb7.tar.gz
googletest-3aa538cbfcc65989721632d2a8d79539512ebdb7.tar.bz2
googletest-3aa538cbfcc65989721632d2a8d79539512ebdb7.zip
fix unit test failure on NoShortCircuitOnFailure and DetectsFlakyShortCircuit when GTEST_HAS_RTTI is 1
Diffstat (limited to 'googlemock')
-rw-r--r--googlemock/test/gmock-matchers_test.cc4
1 files 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());
}