aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/src
diff options
context:
space:
mode:
authorJerry Turcios <jerryturcios08@gmail.com>2018-10-23 20:57:38 -0400
committerJerry Turcios <jerryturcios08@gmail.com>2018-10-23 20:57:38 -0400
commit6e37201260b135d76f56af63589fd2b1c50a1ed3 (patch)
tree628fb56b74b238298bde9f4c5cc6ee7654088c99 /googlemock/src
parent3468af9b36e7160aafc8b3952b2721dc9d1abd95 (diff)
parent7b6b3be34241dfa9fdfd53797734bdc18683c50b (diff)
downloadgoogletest-6e37201260b135d76f56af63589fd2b1c50a1ed3.tar.gz
googletest-6e37201260b135d76f56af63589fd2b1c50a1ed3.tar.bz2
googletest-6e37201260b135d76f56af63589fd2b1c50a1ed3.zip
Merge branch 'master' of https://github.com/google/googletest
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)