aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/docs
diff options
context:
space:
mode:
authorShaindel Schwartz <shaindel@google.com>2019-09-12 12:10:51 -0400
committerShaindel Schwartz <shaindel@google.com>2019-09-12 12:10:51 -0400
commitc7a03daa99e7c457561b5dd2afc0eddab166e48e (patch)
treeef122e5c8d5e0c5239a29f1a56012445f59cb867 /googlemock/docs
parentac24edd6e06114818b1a29c99bb81153514f7fb2 (diff)
parent7bd4a7f3e9ae46bb7d99fc5fd5dd1a137496bb6a (diff)
downloadgoogletest-c7a03daa99e7c457561b5dd2afc0eddab166e48e.tar.gz
googletest-c7a03daa99e7c457561b5dd2afc0eddab166e48e.tar.bz2
googletest-c7a03daa99e7c457561b5dd2afc0eddab166e48e.zip
Merge pull request #2387 from kuzkry:iff
PiperOrigin-RevId: 268693457
Diffstat (limited to 'googlemock/docs')
-rw-r--r--googlemock/docs/cheat_sheet.md4
-rw-r--r--googlemock/docs/cook_book.md11
2 files changed, 8 insertions, 7 deletions
diff --git a/googlemock/docs/cheat_sheet.md b/googlemock/docs/cheat_sheet.md
index 618c62d6..850963af 100644
--- a/googlemock/docs/cheat_sheet.md
+++ b/googlemock/docs/cheat_sheet.md
@@ -742,12 +742,12 @@ you can do it earlier:
using ::testing::Mock;
...
// Verifies and removes the expectations on mock_obj;
-// returns true if successful.
+// returns true if and only if successful.
Mock::VerifyAndClearExpectations(&mock_obj);
...
// Verifies and removes the expectations on mock_obj;
// also removes the default actions set by ON_CALL();
-// returns true if successful.
+// returns true if and only if successful.
Mock::VerifyAndClear(&mock_obj);
```
diff --git a/googlemock/docs/cook_book.md b/googlemock/docs/cook_book.md
index 28f7ba1d..3a3308e0 100644
--- a/googlemock/docs/cook_book.md
+++ b/googlemock/docs/cook_book.md
@@ -1270,8 +1270,8 @@ what if you want to make sure the value *pointed to* by the pointer, instead of
the pointer itself, has a certain property? Well, you can use the `Pointee(m)`
matcher.
-`Pointee(m)` matches a pointer if `m` matches the value the pointer points to.
-For example:
+`Pointee(m)` matches a pointer if and only if `m` matches the value the pointer
+points to. For example:
```cpp
using ::testing::Ge;
@@ -3573,7 +3573,7 @@ class MatcherInterface {
public:
virtual ~MatcherInterface();
- // Returns true if the matcher matches x; also explains the match
+ // Returns true if and only if the matcher matches x; also explains the match
// result to 'listener'.
virtual bool MatchAndExplain(T x, MatchResultListener* listener) const = 0;
@@ -3727,10 +3727,11 @@ class CardinalityInterface {
public:
virtual ~CardinalityInterface();
- // Returns true if call_count calls will satisfy this cardinality.
+ // Returns true if and only if call_count calls will satisfy this cardinality.
virtual bool IsSatisfiedByCallCount(int call_count) const = 0;
- // Returns true if call_count calls will saturate this cardinality.
+ // Returns true if and only if call_count calls will saturate this
+ // cardinality.
virtual bool IsSaturatedByCallCount(int call_count) const = 0;
// Describes self to an ostream.