diff options
author | Scott Slack-Smith <deenderah@gmail.com> | 2017-11-24 16:00:56 +0000 |
---|---|---|
committer | Scott Slack-Smith <deenderah@gmail.com> | 2017-11-24 16:00:56 +0000 |
commit | 6c093a2391eb66a42bd4146443265eddad06be0c (patch) | |
tree | b61e233a023b5c5a43c31520fd6b84f5a4b37788 /googlemock/docs/CheatSheet.md | |
parent | c958e26fd02d43a916ff297c89eee22166fe7be7 (diff) | |
parent | d175c8bf823e709d570772b038757fadf63bc632 (diff) | |
download | googletest-6c093a2391eb66a42bd4146443265eddad06be0c.tar.gz googletest-6c093a2391eb66a42bd4146443265eddad06be0c.tar.bz2 googletest-6c093a2391eb66a42bd4146443265eddad06be0c.zip |
Merge branch 'master' of https://github.com/google/googletest
Diffstat (limited to 'googlemock/docs/CheatSheet.md')
-rw-r--r-- | googlemock/docs/CheatSheet.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/googlemock/docs/CheatSheet.md b/googlemock/docs/CheatSheet.md index ef4451b8..c6367fdd 100644 --- a/googlemock/docs/CheatSheet.md +++ b/googlemock/docs/CheatSheet.md @@ -65,7 +65,7 @@ can specify it by appending `_WITH_CALLTYPE` to any of the macros described in the previous two sections and supplying the calling convention as the first argument to the macro. For example, ``` - MOCK_METHOD_1_WITH_CALLTYPE(STDMETHODCALLTYPE, Foo, bool(int n)); + MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, Foo, bool(int n)); MOCK_CONST_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, Bar, int(double x, double y)); ``` where `STDMETHODCALLTYPE` is defined by `<objbase.h>` on Windows. @@ -249,7 +249,7 @@ match them more flexibly, or get more informative messages, you can use: | `SizeIs(m)` | `argument` is a container whose size matches `m`. E.g. `SizeIs(2)` or `SizeIs(Lt(2))`. | | `UnorderedElementsAre(e0, e1, ..., en)` | `argument` has `n + 1` elements, and under some permutation each element matches an `ei` (for a different `i`), which can be a value or a matcher. 0 to 10 arguments are allowed. | | `UnorderedElementsAreArray({ e0, e1, ..., en })`, `UnorderedElementsAreArray(array)`, or `UnorderedElementsAreArray(array, count)` | The same as `UnorderedElementsAre()` except that the expected element values/matchers come from an initializer list, STL-style container, or C-style array. | -| `WhenSorted(m)` | When `argument` is sorted using the `<` operator, it matches container matcher `m`. E.g. `WhenSorted(UnorderedElementsAre(1, 2, 3))` verifies that `argument` contains elements `1`, `2`, and `3`, ignoring order. | +| `WhenSorted(m)` | When `argument` is sorted using the `<` operator, it matches container matcher `m`. E.g. `WhenSorted(ElementsAre(1, 2, 3))` verifies that `argument` contains elements `1`, `2`, and `3`, ignoring order. | | `WhenSortedBy(comparator, m)` | The same as `WhenSorted(m)`, except that the given comparator instead of `<` is used to sort `argument`. E.g. `WhenSortedBy(std::greater<int>(), ElementsAre(3, 2, 1))`. | Notes: |