gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use existing Mock::GetReactionOnUninterestingCalls()

Browse Source
This commit is contained in:
Jonathan Wendeborn 2018-10-16 08:37:45 +02:00
parent 6bbf911a8d
commit 386391b014
No known key found for this signature in database
GPG Key ID: ED1F53B38A62F08E
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
googlemock/src/gmock-spec-builders.cc
View File

@ -707,31 +707,17 @@ bool Mock::VerifyAndClearExpectationsLocked(void* mock_obj)
return expectations_met; return expectations_met;
} }
namespace {
// checks whether the specified mock_obj has a registered call reaction
bool HasCallReaction(void* mock_obj, internal::CallReaction reaction) {
const auto found = g_uninteresting_call_reaction.find(mock_obj);
if (found == g_uninteresting_call_reaction.cend()) {
return internal::kDefault == reaction;
}
return found->second == reaction;
}
}
bool Mock::IsNaggy(void* mock_obj) bool Mock::IsNaggy(void* mock_obj)
GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) { GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
internal::MutexLock l(&internal::g_gmock_mutex); return Mock::GetReactionOnUninterestingCalls(mock_obj) == internal::kWarn;
return HasCallReaction(mock_obj, internal::kWarn);
} }
bool Mock::IsNice(void* mock_obj) bool Mock::IsNice(void* mock_obj)
GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) { GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
internal::MutexLock l(&internal::g_gmock_mutex); return Mock::GetReactionOnUninterestingCalls(mock_obj) == internal::kAllow;
return HasCallReaction(mock_obj, internal::kAllow);
} }
bool Mock::IsStrict(void* mock_obj) bool Mock::IsStrict(void* mock_obj)
GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) { GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
internal::MutexLock l(&internal::g_gmock_mutex); return Mock::GetReactionOnUninterestingCalls(mock_obj) == internal::kFail;
return HasCallReaction(mock_obj, internal::kFail);
} }
// Registers a mock object and a mock method it owns. // Registers a mock object and a mock method it owns.