aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/include
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/include
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/include')
-rw-r--r--googlemock/include/gmock/gmock-spec-builders.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/googlemock/include/gmock/gmock-spec-builders.h b/googlemock/include/gmock/gmock-spec-builders.h
index 849bc92a..5d4b73ba 100644
--- a/googlemock/include/gmock/gmock-spec-builders.h
+++ b/googlemock/include/gmock/gmock-spec-builders.h
@@ -399,6 +399,16 @@ class GTEST_API_ Mock {
static bool VerifyAndClear(void* mock_obj)
GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+ // Returns whether the mock was created as a naggy mock (default)
+ static bool IsNaggy(void* mock_obj)
+ GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+ // Returns whether the mock was created as a nice mock
+ static bool IsNice(void* mock_obj)
+ GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+ // Returns whether the mock was created as a strict mock
+ static bool IsStrict(void* mock_obj)
+ GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+
private:
friend class internal::UntypedFunctionMockerBase;