diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-12 14:46:57 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-12 14:46:57 -0400 |
| commit | 092ca91072bfca56da3f7c19d4a07f0f5074f0ba (patch) | |
| tree | 4e36b08ece41f52938b2c4c0c9532c2dc68c4afa | |
| parent | 6fb65b8215610ee7c447526784eeace091164b90 (diff) | |
| download | googletest-092ca91072bfca56da3f7c19d4a07f0f5074f0ba.tar.gz googletest-092ca91072bfca56da3f7c19d4a07f0f5074f0ba.tar.bz2 googletest-092ca91072bfca56da3f7c19d4a07f0f5074f0ba.zip | |
merging
| -rw-r--r-- | googlemock/test/gmock-more-actions_test.cc | 14 | ||||
| -rw-r--r-- | googlemock/test/gmock-spec-builders_test.cc | 4 |
2 files changed, 8 insertions, 10 deletions
diff --git a/googlemock/test/gmock-more-actions_test.cc b/googlemock/test/gmock-more-actions_test.cc index f5e28eae..ed83fad4 100644 --- a/googlemock/test/gmock-more-actions_test.cc +++ b/googlemock/test/gmock-more-actions_test.cc @@ -327,11 +327,8 @@ TEST(InvokeTest, FunctionThatTakes10Arguments) { // Tests using Invoke() with functions with parameters declared as Unused. TEST(InvokeTest, FunctionWithUnusedParameters) { - Action<int(int, int, double, const string&)> a1 = - Invoke(SumOfFirst2); - string s("hi"); - EXPECT_EQ(12, a1.Perform( - tuple<int, int, double, const string&>(10, 2, 5.6, s))); + Action<int(int, int, double, const std::string&)> a1 = Invoke(SumOfFirst2); + EXPECT_EQ(12, a1.Perform(make_tuple(10, 2, 5.6, std::string("hi")))); Action<int(int, int, bool, int*)> a2 = Invoke(SumOfFirst2); @@ -380,10 +377,9 @@ TEST(InvokeMethodTest, Unary) { // Tests using Invoke() with a binary method. TEST(InvokeMethodTest, Binary) { Foo foo; - Action<string(const string&, char)> a = Invoke(&foo, &Foo::Binary); - string s("Hell"); - EXPECT_EQ("Hello", a.Perform( - tuple<const string&, char>(s, 'o'))); + Action<std::string(const std::string&, char)> a = Invoke(&foo, &Foo::Binary); + std::string s("Hell"); + EXPECT_EQ("Hello", a.Perform(make_tuple(s, 'o'))); } // Tests using Invoke() with a ternary method. diff --git a/googlemock/test/gmock-spec-builders_test.cc b/googlemock/test/gmock-spec-builders_test.cc index 6001582a..f1d571be 100644 --- a/googlemock/test/gmock-spec-builders_test.cc +++ b/googlemock/test/gmock-spec-builders_test.cc @@ -2173,7 +2173,9 @@ class GMockVerboseFlagTest : public VerboseFlagPreservingFixture { "NOTE: You can safely ignore the above warning unless this " "call should not happen. Do not suppress it by blindly adding " "an EXPECT_CALL() if you don't mean to enforce the call. " - "See https://github.com/google/googletest/blob/master/googlemock/docs/CookBook.md#" + "See " + "https://github.com/google/googletest/blob/master/googlemock/docs/" + "CookBook.md#" "knowing-when-to-expect for details."; // A void-returning function. |