diff options
author | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2010-10-05 05:58:51 +0000 |
---|---|---|
committer | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2010-10-05 05:58:51 +0000 |
commit | 5921483640fed07d8dcfff9cc34fe353fec55f26 (patch) | |
tree | 03baf2cdbb67f20554195355eb0f12d078d29288 /test/gmock_link_test.h | |
parent | 662d8a23502173db60e2d9d600c508e06d8ba173 (diff) | |
download | googletest-5921483640fed07d8dcfff9cc34fe353fec55f26.tar.gz googletest-5921483640fed07d8dcfff9cc34fe353fec55f26.tar.bz2 googletest-5921483640fed07d8dcfff9cc34fe353fec55f26.zip |
Adds SetArgPointee to replace SetArgumentPointee.
Diffstat (limited to 'test/gmock_link_test.h')
-rw-r--r-- | test/gmock_link_test.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/gmock_link_test.h b/test/gmock_link_test.h index 00b2110d..499cc186 100644 --- a/test/gmock_link_test.h +++ b/test/gmock_link_test.h @@ -44,7 +44,7 @@ // ReturnNull // ReturnRef // Assign -// SetArgumentPointee +// SetArgPointee // SetArrayArgument // SetErrnoAndReturn // Invoke(function) @@ -164,7 +164,7 @@ using testing::ResultOf; using testing::Return; using testing::ReturnNull; using testing::ReturnRef; -using testing::SetArgumentPointee; +using testing::SetArgPointee; using testing::SetArrayArgument; using testing::StartsWith; using testing::StrCaseEq; @@ -281,12 +281,12 @@ TEST(LinkTest, TestAssign) { mock.VoidFromString(NULL); } -// Tests the linkage of the SetArgumentPointee action. -TEST(LinkTest, TestSetArgumentPointee) { +// Tests the linkage of the SetArgPointee action. +TEST(LinkTest, TestSetArgPointee) { Mock mock; char ch = 'x'; - EXPECT_CALL(mock, VoidFromString(_)).WillOnce(SetArgumentPointee<0>('y')); + EXPECT_CALL(mock, VoidFromString(_)).WillOnce(SetArgPointee<0>('y')); mock.VoidFromString(&ch); } @@ -381,7 +381,7 @@ TEST(LinkTest, TestDoAll) { char ch = 'x'; EXPECT_CALL(mock, VoidFromString(_)) - .WillOnce(DoAll(SetArgumentPointee<0>('y'), Return())); + .WillOnce(DoAll(SetArgPointee<0>('y'), Return())); mock.VoidFromString(&ch); } |