Same fixes for "current" version.

This commit is contained in:
Carlos O'Ryan 2017-07-01 15:27:07 -04:00
parent 1dde1eed38
commit f20797bd8d

View File

@ -1029,9 +1029,10 @@ a value that satisfies matcher `m`.
For example: 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 Note that in `Property(&Foo::baz, ...)`, method `baz()` must take no
argument and be declared as `const`. argument and be declared as `const`.
@ -2482,12 +2483,12 @@ MockFoo::~MockFoo() {}
## Forcing a Verification ## ## 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 verify that all expectations on it have been satisfied, and will
generate [Google Test](../../googletest/) failures generate [Google Test](../../googletest/) failures
if not. This is convenient as it leaves you with one less thing to 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 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? 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 Well, it might be created on the heap and owned by the code you are