aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock
diff options
context:
space:
mode:
authorCarlos O'Ryan <coryan@google.com>2017-07-01 15:27:07 -0400
committerCarlos O'Ryan <coryan@google.com>2017-07-01 15:27:07 -0400
commitf20797bd8dd1c5ea3ae95218abdf3807be497993 (patch)
tree8b2f072e15f8766bbb99e7daf1df85c91401b538 /googlemock
parent1dde1eed381a68af1e1a2ea477c26b3b1ead716b (diff)
downloadgoogletest-f20797bd8dd1c5ea3ae95218abdf3807be497993.tar.gz
googletest-f20797bd8dd1c5ea3ae95218abdf3807be497993.tar.bz2
googletest-f20797bd8dd1c5ea3ae95218abdf3807be497993.zip
Same fixes for "current" version.
Diffstat (limited to 'googlemock')
-rw-r--r--googlemock/docs/CookBook.md9
1 files changed, 5 insertions, 4 deletions
diff --git a/googlemock/docs/CookBook.md b/googlemock/docs/CookBook.md
index 0460d357..5c1e5b8e 100644
--- a/googlemock/docs/CookBook.md
+++ b/googlemock/docs/CookBook.md
@@ -1029,9 +1029,10 @@ a value that satisfies matcher `m`.
For example:
-> | `Field(&Foo::number, Ge(3))` | Matches `x` where `x.number >= 3`. |
+| Expression | Description |
|:-----------------------------|:-----------------------------------|
-> | `Property(&Foo::name, StartsWith("John "))` | Matches `x` where `x.name()` starts with `"John "`. |
+| `Field(&Foo::number, Ge(3))` | Matches `x` where `x.number >= 3`. |
+| `Property(&Foo::name, StartsWith("John "))` | Matches `x` where `x.name()` starts with `"John "`. |
Note that in `Property(&Foo::baz, ...)`, method `baz()` must take no
argument and be declared as `const`.
@@ -2482,12 +2483,12 @@ MockFoo::~MockFoo() {}
## Forcing a Verification ##
-When it's being destoyed, your friendly mock object will automatically
+When it's being destroyed, your friendly mock object will automatically
verify that all expectations on it have been satisfied, and will
generate [Google Test](../../googletest/) failures
if not. This is convenient as it leaves you with one less thing to
worry about. That is, unless you are not sure if your mock object will
-be destoyed.
+be destroyed.
How could it be that your mock object won't eventually be destroyed?
Well, it might be created on the heap and owned by the code you are