summaryrefslogtreecommitdiff
path: root/googlemock/docs
diff options
context:
space:
mode:
authorDerek Mauro <dmauro@google.com>2020-09-10 19:09:21 -0400
committerDerek Mauro <dmauro@google.com>2020-09-10 19:09:21 -0400
commit646603961bf88f8b07e5da952612cfe1e0e020fa (patch)
treef96c01597c885df897f4b09f721be20fa496523a /googlemock/docs
parent5f8fcf4aa8ce30dfe76f9c9db97d2da4ce3737ef (diff)
parent296c9d29b16375c30781bb9109f3159a9ddbba9c (diff)
downloadgoogletest-git-646603961bf88f8b07e5da952612cfe1e0e020fa.tar.gz
Merge pull request #2994 from xerus2000:gmock-docs
PiperOrigin-RevId: 330545489
Diffstat (limited to 'googlemock/docs')
-rw-r--r--googlemock/docs/cook_book.md10
1 files changed, 6 insertions, 4 deletions
diff --git a/googlemock/docs/cook_book.md b/googlemock/docs/cook_book.md
index d7cee698..3cd9afba 100644
--- a/googlemock/docs/cook_book.md
+++ b/googlemock/docs/cook_book.md
@@ -3,7 +3,7 @@
<!-- GOOGLETEST_CM0012 DO NOT DELETE -->
You can find recipes for using gMock here. If you haven't yet, please read
-[this](for_dummies.md) first to make sure you understand the basics.
+[the dummy guide](for_dummies.md) first to make sure you understand the basics.
**Note:** gMock lives in the `testing` name space. For readability, it is
recommended to write `using ::testing::Foo;` once in your file before using the
@@ -283,9 +283,11 @@ recipe for [mocking non-virtual methods](#MockingNonVirtualMethods).
### Old-Style `MOCK_METHODn` Macros
-Before the generic `MOCK_METHOD` macro was introduced, mocks where created using
-a family of macros collectively called `MOCK_METHODn`. These macros are still
-supported, though migration to the new `MOCK_METHOD` is recommended.
+Before the generic `MOCK_METHOD` macro
+[was introduced in 2018](https://github.com/google/googletest/commit/c5f08bf91944ce1b19bcf414fa1760e69d20afc2),
+mocks where created using a family of macros collectively called `MOCK_METHODn`.
+These macros are still supported, though migration to the new `MOCK_METHOD` is
+recommended.
The macros in the `MOCK_METHODn` family differ from `MOCK_METHOD`: