diff options
| author | Claus Stovgaard <claus.stovgaard@gmail.com> | 2017-08-31 10:22:53 (GMT) |
|---|---|---|
| committer | Claus Stovgaard <claus.stovgaard@gmail.com> | 2017-08-31 10:22:53 (GMT) |
| commit | 34355c0e870efce3015fa19aff88c7d79839bbb1 (patch) | |
| tree | 0fa858569364bb5818793d97d264aefd365399b5 /googlemock/include/gmock/gmock-actions.h | |
| parent | a6418a4dd19ea0e8aa5f7706b8bff12a2e453821 (diff) | |
| parent | 16bfba08e2c63c33834a98d092cd6f1a3e547289 (diff) | |
| download | googletest-34355c0e870efce3015fa19aff88c7d79839bbb1.zip googletest-34355c0e870efce3015fa19aff88c7d79839bbb1.tar.gz googletest-34355c0e870efce3015fa19aff88c7d79839bbb1.tar.bz2 | |
Merge remote-tracking branch 'github_google/master' into master-github_frosteyesrefs/pull/865/head
# Conflicts:
# .gitignore
Diffstat (limited to 'googlemock/include/gmock/gmock-actions.h')
| -rw-r--r-- | googlemock/include/gmock/gmock-actions.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/googlemock/include/gmock/gmock-actions.h b/googlemock/include/gmock/gmock-actions.h index b3f654a..845c823 100644 --- a/googlemock/include/gmock/gmock-actions.h +++ b/googlemock/include/gmock/gmock-actions.h @@ -1029,9 +1029,9 @@ class DoBothAction { // return sqrt(x*x + y*y); // } // ... -// EXEPCT_CALL(mock, Foo("abc", _, _)) +// EXPECT_CALL(mock, Foo("abc", _, _)) // .WillOnce(Invoke(DistanceToOriginWithLabel)); -// EXEPCT_CALL(mock, Bar(5, _, _)) +// EXPECT_CALL(mock, Bar(5, _, _)) // .WillOnce(Invoke(DistanceToOriginWithIndex)); // // you could write @@ -1041,8 +1041,8 @@ class DoBothAction { // return sqrt(x*x + y*y); // } // ... -// EXEPCT_CALL(mock, Foo("abc", _, _)).WillOnce(Invoke(DistanceToOrigin)); -// EXEPCT_CALL(mock, Bar(5, _, _)).WillOnce(Invoke(DistanceToOrigin)); +// EXPECT_CALL(mock, Foo("abc", _, _)).WillOnce(Invoke(DistanceToOrigin)); +// EXPECT_CALL(mock, Bar(5, _, _)).WillOnce(Invoke(DistanceToOrigin)); typedef internal::IgnoredValue Unused; // This constructor allows us to turn an Action<From> object into an |