diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-01-02 10:54:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-02 10:54:26 -0500 |
| commit | fa6730103ecaad750f42700c55a92c3e212a9271 (patch) | |
| tree | 3c9e1638dc96dfe918b73e87d4b389d3bbe5dd86 /googlemock/include/gmock/gmock-actions.h | |
| parent | ca6a70c6082ff526b993c622d192c6d519800bc2 (diff) | |
| parent | 1c2f1907047216654599b0057df49d21a2c1400a (diff) | |
| download | googletest-fa6730103ecaad750f42700c55a92c3e212a9271.tar.gz googletest-fa6730103ecaad750f42700c55a92c3e212a9271.tar.bz2 googletest-fa6730103ecaad750f42700c55a92c3e212a9271.zip | |
Merge branch 'master' into uintptr
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 |