diff options
| author | gpetit <gaspard.petit@eidosmontreal.com> | 2017-08-14 13:45:45 -0400 |
|---|---|---|
| committer | gpetit <gaspard.petit@eidosmontreal.com> | 2017-08-14 13:45:45 -0400 |
| commit | 0c3c811164535eb5e539d83befba9caba48a9dfd (patch) | |
| tree | 0bc15116e1259078b02e6608bc10d838711759b5 /googlemock/include/gmock/gmock-actions.h | |
| parent | 8f04622cc1507a3954490a03a1dfcff9e340359e (diff) | |
| parent | 673c975a963f356b19fea90cb57b69192253da2a (diff) | |
| download | googletest-0c3c811164535eb5e539d83befba9caba48a9dfd.tar.gz googletest-0c3c811164535eb5e539d83befba9caba48a9dfd.tar.bz2 googletest-0c3c811164535eb5e539d83befba9caba48a9dfd.zip | |
Merge remote-tracking branch 'origin/master' into user_logger_instead_of_printf
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 b3f654af..845c8232 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 |