diff options
| author | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2013-06-18 18:49:51 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2013-06-18 18:49:51 +0000 |
| commit | 616180e6847dd3cc6517a59ff2d24e9fd5c8052c (patch) | |
| tree | f1470b135e8587cd71b5942944be9ae9d6e740a8 /test/gmock-more-actions_test.cc | |
| parent | f4274520da256a3e8dd4fe2aa2e714f44ad89d18 (diff) | |
| download | googletest-616180e6847dd3cc6517a59ff2d24e9fd5c8052c.tar.gz googletest-616180e6847dd3cc6517a59ff2d24e9fd5c8052c.tar.bz2 googletest-616180e6847dd3cc6517a59ff2d24e9fd5c8052c.zip | |
New floating-point matchers: DoubleNear() and friends;
AllOf() and AnyOf() can accept any number of arguments now in C++11 mode.
Diffstat (limited to 'test/gmock-more-actions_test.cc')
| -rw-r--r-- | test/gmock-more-actions_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/gmock-more-actions_test.cc b/test/gmock-more-actions_test.cc index 9fa9e2ec..9dde5ebb 100644 --- a/test/gmock-more-actions_test.cc +++ b/test/gmock-more-actions_test.cc @@ -327,7 +327,7 @@ TEST(InvokeTest, FunctionThatTakes10Arguments) { TEST(InvokeTest, FunctionWithUnusedParameters) { Action<int(int, int, double, const string&)> a1 = Invoke(SumOfFirst2); - EXPECT_EQ(12, a1.Perform(make_tuple(10, 2, 5.6, CharPtr("hi")))); + EXPECT_EQ(12, a1.Perform(make_tuple(10, 2, 5.6, string("hi")))); Action<int(int, int, bool, int*)> a2 = Invoke(SumOfFirst2); |