diff options
author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-12-18 11:38:08 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-18 11:38:08 -0500 |
commit | a7bd3725f08fe38374544bbf8f03699fc0d32a0b (patch) | |
tree | 09510ad34eef68866ade872c73640ccef268cc48 /googlemock/docs/CheatSheet.md | |
parent | 79cdf971fbf8f1efb1573df97bcc6f5e8ef3215a (diff) | |
parent | 1865ecaf1779c2a2f210ca3768aa030206ef74ba (diff) | |
download | googletest-a7bd3725f08fe38374544bbf8f03699fc0d32a0b.tar.gz googletest-a7bd3725f08fe38374544bbf8f03699fc0d32a0b.tar.bz2 googletest-a7bd3725f08fe38374544bbf8f03699fc0d32a0b.zip |
Merge branch 'master' into bazel
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: |