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-generated-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-generated-actions_test.cc')
| -rw-r--r-- | test/gmock-generated-actions_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/gmock-generated-actions_test.cc b/test/gmock-generated-actions_test.cc index 23f8c8b0..31812716 100644 --- a/test/gmock-generated-actions_test.cc +++ b/test/gmock-generated-actions_test.cc @@ -376,7 +376,7 @@ class SubstractAction : public ActionInterface<int(int, int)> { // NOLINT TEST(WithArgsTest, NonInvokeAction) { Action<int(const string&, int, int)> a = // NOLINT WithArgs<2, 1>(MakeAction(new SubstractAction)); - EXPECT_EQ(8, a.Perform(make_tuple(CharPtr("hi"), 2, 10))); + EXPECT_EQ(8, a.Perform(make_tuple(string("hi"), 2, 10))); } // Tests using WithArgs to pass all original arguments in the original order. |