diff options
author | Herbert Thielen <thielen@hs-worms.de> | 2017-09-05 11:32:13 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-05 11:32:13 +0200 |
commit | 88b76525dd2731cdbad0c60d04464c083d863510 (patch) | |
tree | 3109ab05a99bc982e09fd460d438db8fa0e7c069 /googlemock/docs/CheatSheet.md | |
parent | 1a8ba67414be5b56fba32059158dc171c0663d29 (diff) | |
parent | 7c6353d29a147cad1c904bf2957fd4ca2befe135 (diff) | |
download | googletest-88b76525dd2731cdbad0c60d04464c083d863510.tar.gz googletest-88b76525dd2731cdbad0c60d04464c083d863510.tar.bz2 googletest-88b76525dd2731cdbad0c60d04464c083d863510.zip |
Merge branch 'master' into hethi/unused-import
Diffstat (limited to 'googlemock/docs/CheatSheet.md')
-rw-r--r-- | googlemock/docs/CheatSheet.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/docs/CheatSheet.md b/googlemock/docs/CheatSheet.md index ef4451b8..c94c2dac 100644 --- a/googlemock/docs/CheatSheet.md +++ b/googlemock/docs/CheatSheet.md @@ -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: |