diff options
| author | Alyssa Wilk <alyssar@chromium.org> | 2017-08-10 13:41:09 (GMT) |
|---|---|---|
| committer | Alyssa Wilk <alyssar@chromium.org> | 2017-08-10 13:41:09 (GMT) |
| commit | 6e1970e2376c14bf658eb88f655a054030353f9f (patch) | |
| tree | d8803debb6882160b43ef253a5b6033972d9c6d2 /googlemock/include | |
| parent | b322d1d91d92b2e38513f0fc86de9e93314d8006 (diff) | |
| download | googletest-6e1970e2376c14bf658eb88f655a054030353f9f.zip googletest-6e1970e2376c14bf658eb88f655a054030353f9f.tar.gz googletest-6e1970e2376c14bf658eb88f655a054030353f9f.tar.bz2 | |
Adding a flag option to change the default mock type
Diffstat (limited to 'googlemock/include')
| -rw-r--r-- | googlemock/include/gmock/gmock-spec-builders.h | 1 | ||||
| -rw-r--r-- | googlemock/include/gmock/gmock.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/include/gmock/gmock-spec-builders.h b/googlemock/include/gmock/gmock-spec-builders.h index 39f7212..9680244 100644 --- a/googlemock/include/gmock/gmock-spec-builders.h +++ b/googlemock/include/gmock/gmock-spec-builders.h @@ -363,7 +363,6 @@ enum CallReaction { kAllow, kWarn, kFail, - kDefault = kWarn // By default, warn about uninteresting calls. }; } // namespace internal diff --git a/googlemock/include/gmock/gmock.h b/googlemock/include/gmock/gmock.h index 6735c71..5764bc8 100644 --- a/googlemock/include/gmock/gmock.h +++ b/googlemock/include/gmock/gmock.h @@ -71,6 +71,7 @@ namespace testing { // Declares Google Mock flags that we want a user to use programmatically. GMOCK_DECLARE_bool_(catch_leaked_mocks); GMOCK_DECLARE_string_(verbose); +GMOCK_DECLARE_int32_(default_mock_behavior); // Initializes Google Mock. This must be called before running the // tests. In particular, it parses the command line for the flags |