diff --git a/googlemock/test/gmock-generated-actions_test.cc b/googlemock/test/gmock-generated-actions_test.cc index c2d2a0a8..5ca5bc78 100644 --- a/googlemock/test/gmock-generated-actions_test.cc +++ b/googlemock/test/gmock-generated-actions_test.cc @@ -376,7 +376,8 @@ class SubstractAction : public ActionInterface { // NOLINT TEST(WithArgsTest, NonInvokeAction) { Action a = // NOLINT WithArgs<2, 1>(MakeAction(new SubstractAction)); - EXPECT_EQ(8, a.Perform(make_tuple(string("hi"), 2, 10))); + string s("hello"); + EXPECT_EQ(8, a.Perform(tuple(s, 2, 10))); } // Tests using WithArgs to pass all original arguments in the original order. @@ -753,7 +754,7 @@ TEST(ActionPMacroTest, CanReferenceArgumentAndParameterTypes) { TEST(ActionPMacroTest, WorksInCompatibleMockFunction) { Action a1 = Plus("tail"); const std::string re = "re"; - EXPECT_EQ("retail", a1.Perform(make_tuple(re))); + EXPECT_EQ("retail", a1.Perform(tuple(re))); } // Tests that we can use ACTION*() to define actions overloaded on the @@ -795,7 +796,7 @@ TEST(ActionPnMacroTest, WorksFor3Parameters) { Action a2 = Plus("tail", "-", ">"); const std::string re = "re"; - EXPECT_EQ("retail->", a2.Perform(make_tuple(re))); + EXPECT_EQ("retail->", a2.Perform(tuple(re))); } ACTION_P4(Plus, p0, p1, p2, p3) { return arg0 + p0 + p1 + p2 + p3; } diff --git a/googlemock/test/gmock-more-actions_test.cc b/googlemock/test/gmock-more-actions_test.cc index 9477fe9f..77e15bd5 100644 --- a/googlemock/test/gmock-more-actions_test.cc +++ b/googlemock/test/gmock-more-actions_test.cc @@ -327,7 +327,9 @@ TEST(InvokeTest, FunctionThatTakes10Arguments) { TEST(InvokeTest, FunctionWithUnusedParameters) { Action a1 = Invoke(SumOfFirst2); - EXPECT_EQ(12, a1.Perform(make_tuple(10, 2, 5.6, string("hi")))); + string s("hi"); + EXPECT_EQ(12, a1.Perform( + tuple(10, 2, 5.6, s))); Action a2 = Invoke(SumOfFirst2); @@ -379,7 +381,8 @@ TEST(InvokeMethodTest, Binary) { Foo foo; Action a = Invoke(&foo, &Foo::Binary); string s("Hell"); - EXPECT_EQ("Hello", a.Perform(make_tuple(s, 'o'))); + EXPECT_EQ("Hello", a.Perform( + tuple(s, 'o'))); } // Tests using Invoke() with a ternary method.