aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/include/gmock/gmock-actions.h
diff options
context:
space:
mode:
authordrgler <daniel.kruegler@gmail.com>2017-08-22 20:19:13 +0200
committerdrgler <daniel.kruegler@gmail.com>2017-08-22 21:13:32 +0200
commitd93ce9d6fb8ea690239c69be6cbc58099a55ec13 (patch)
tree65575eed9d0e5e39686efe40d530c45c00851b9d /googlemock/include/gmock/gmock-actions.h
parent6404d45a92528cb0a8f8294d4c0b057c23138de5 (diff)
parent8304d06199bdfb13bfb7613db9b5231141300e25 (diff)
downloadgoogletest-d93ce9d6fb8ea690239c69be6cbc58099a55ec13.tar.gz
googletest-d93ce9d6fb8ea690239c69be6cbc58099a55ec13.tar.bz2
googletest-d93ce9d6fb8ea690239c69be6cbc58099a55ec13.zip
Merge branch 'master' of github.com:Dani-Hub/googletest
Diffstat (limited to 'googlemock/include/gmock/gmock-actions.h')
-rw-r--r--googlemock/include/gmock/gmock-actions.h8
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