gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merging

Browse Source
This commit is contained in:
Gennadiy Civil
2018-04-12 14:46:57 -04:00
parent 6fb65b8215
commit 092ca91072
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
googlemock/test/gmock-more-actions_test.cc
View File

@@ -327,11 +327,8 @@ TEST(InvokeTest, FunctionThatTakes10Arguments) {
// Tests using Invoke() with functions with parameters declared as Unused. // Tests using Invoke() with functions with parameters declared as Unused.
TEST(InvokeTest, FunctionWithUnusedParameters) { TEST(InvokeTest, FunctionWithUnusedParameters) {
Action<int(int, int, double, const string&)> a1 = Action<int(int, int, double, const std::string&)> a1 = Invoke(SumOfFirst2);
Invoke(SumOfFirst2); EXPECT_EQ(12, a1.Perform(make_tuple(10, 2, 5.6, std::string("hi"))));
string s("hi");
EXPECT_EQ(12, a1.Perform(
tuple<int, int, double, const string&>(10, 2, 5.6, s)));
Action<int(int, int, bool, int*)> a2 = Action<int(int, int, bool, int*)> a2 =
Invoke(SumOfFirst2); Invoke(SumOfFirst2);
@@ -380,10 +377,9 @@ TEST(InvokeMethodTest, Unary) {
// Tests using Invoke() with a binary method. // Tests using Invoke() with a binary method.
TEST(InvokeMethodTest, Binary) { TEST(InvokeMethodTest, Binary) {
Foo foo; Foo foo;
Action<string(const string&, char)> a = Invoke(&foo, &Foo::Binary); Action<std::string(const std::string&, char)> a = Invoke(&foo, &Foo::Binary);
string s("Hell"); std::string s("Hell");
EXPECT_EQ("Hello", a.Perform( EXPECT_EQ("Hello", a.Perform(make_tuple(s, 'o')));
tuple<const string&, char>(s, 'o')));
} }
// Tests using Invoke() with a ternary method. // Tests using Invoke() with a ternary method.

4
googlemock/test/gmock-spec-builders_test.cc
View File

@@ -2173,7 +2173,9 @@ class GMockVerboseFlagTest : public VerboseFlagPreservingFixture {
"NOTE: You can safely ignore the above warning unless this " "NOTE: You can safely ignore the above warning unless this "
"call should not happen. Do not suppress it by blindly adding " "call should not happen. Do not suppress it by blindly adding "
"an EXPECT_CALL() if you don't mean to enforce the call. " "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."; "knowing-when-to-expect for details.";
// A void-returning function. // A void-returning function.