aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/src
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2018-10-23 15:13:41 -0400
committerGennadiy Civil <misterg@google.com>2018-10-23 15:13:42 -0400
commit20eaf6e3a9dbefcb1fb91b9a438aaef70cd999cf (patch)
tree5c1342dd6e163bf6ffca9cb3320733f2ba25c618 /googlemock/src
parenta743780ad03ba3cbcb2f76f8a74249f0cae46acc (diff)
parent0cefda7749756806445a9caab4d8517c808f61f6 (diff)
downloadgoogletest-20eaf6e3a9dbefcb1fb91b9a438aaef70cd999cf.tar.gz
googletest-20eaf6e3a9dbefcb1fb91b9a438aaef70cd999cf.tar.bz2
googletest-20eaf6e3a9dbefcb1fb91b9a438aaef70cd999cf.zip
Merge pull request #1911 from BrukerJWD:isnice
PiperOrigin-RevId: 218384341
Diffstat (limited to 'googlemock/src')
-rw-r--r--googlemock/src/gmock-spec-builders.cc13
1 files changed, 13 insertions, 0 deletions
diff --git a/googlemock/src/gmock-spec-builders.cc b/googlemock/src/gmock-spec-builders.cc
index 1a8def44..5c20ed14 100644
--- a/googlemock/src/gmock-spec-builders.cc
+++ b/googlemock/src/gmock-spec-builders.cc
@@ -757,6 +757,19 @@ bool Mock::VerifyAndClearExpectationsLocked(void* mock_obj)
return expectations_met;
}
+bool Mock::IsNaggy(void* mock_obj)
+ GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
+ return Mock::GetReactionOnUninterestingCalls(mock_obj) == internal::kWarn;
+}
+bool Mock::IsNice(void* mock_obj)
+ GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
+ return Mock::GetReactionOnUninterestingCalls(mock_obj) == internal::kAllow;
+}
+bool Mock::IsStrict(void* mock_obj)
+ GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
+ return Mock::GetReactionOnUninterestingCalls(mock_obj) == internal::kFail;
+}
+
// Registers a mock object and a mock method it owns.
void Mock::Register(const void* mock_obj,
internal::UntypedFunctionMockerBase* mocker)