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

Merge a76b9f5f42 into 52204f78f9

Browse source
This commit is contained in:
Yesudeep Mangalapilly 2025-03-30 13:35:51 +00:00 • committed by GitHub
commit 06f85db6ec
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
googlemock/src/gmock-spec-builders.cc
View file

@ -443,13 +443,6 @@ bool UntypedFunctionMockerBase::VerifyAndClearExpectationsLocked()
return expectations_met;
}
static CallReaction intToCallReaction(int mock_behavior) {
if (mock_behavior >= kAllow && mock_behavior <= kFail) {
return static_cast<internal::CallReaction>(mock_behavior);
}
return kWarn;
}
} // namespace internal
// Class Mock.
@ -546,6 +539,13 @@ class MockObjectRegistry {
// Protected by g_gmock_mutex.
MockObjectRegistry g_mock_object_registry;
static internal::CallReaction intToCallReaction(int mock_behavior) {
if (mock_behavior >= internal::kAllow && mock_behavior <= internal::kFail) {
return static_cast<internal::CallReaction>(mock_behavior);
}
return internal::kWarn;
}
// Maps a mock object to the reaction Google Mock should have when an
// uninteresting method is called. Protected by g_gmock_mutex.
std::unordered_map<uintptr_t, internal::CallReaction>&
@ -601,8 +601,7 @@ internal::CallReaction Mock::GetReactionOnUninterestingCalls(
internal::MutexLock l(&internal::g_gmock_mutex);
return (UninterestingCallReactionMap().count(
reinterpret_cast<uintptr_t>(mock_obj)) == 0)
? internal::intToCallReaction(
GMOCK_FLAG_GET(default_mock_behavior))
? intToCallReaction(GMOCK_FLAG_GET(default_mock_behavior))
: UninterestingCallReactionMap()[reinterpret_cast<uintptr_t>(
mock_obj)];
}