aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2018-04-13 11:49:37 -0400
committerGennadiy Civil <misterg@google.com>2018-04-13 11:49:37 -0400
commitb74a1af00f17cd52c426c08e0d1a1b4ea93f78dd (patch)
tree1b66c3c099990caaf05744af9160c916fc2c6980
parentf9bd6180debc46d59fa0ddd0e08bb361e3ca18bc (diff)
downloadgoogletest-b74a1af00f17cd52c426c08e0d1a1b4ea93f78dd.tar.gz
googletest-b74a1af00f17cd52c426c08e0d1a1b4ea93f78dd.tar.bz2
googletest-b74a1af00f17cd52c426c08e0d1a1b4ea93f78dd.zip
osx pizzas
-rw-r--r--googlemock/test/gmock-actions_test.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/googlemock/test/gmock-actions_test.cc b/googlemock/test/gmock-actions_test.cc
index 5dd48460..c8b62fc2 100644
--- a/googlemock/test/gmock-actions_test.cc
+++ b/googlemock/test/gmock-actions_test.cc
@@ -1539,9 +1539,10 @@ TEST(FunctorActionTest, TypeConversion) {
TEST(FunctorActionTest, UnusedArguments) {
// Verify that users can ignore uninteresting arguments.
- Action<int(int, std::unique_ptr<int>, const int&)> a =
+ Action<int(int, double y, const int&)> a =
[](int i, Unused, Unused) { return 2 * i; };
- EXPECT_EQ(6, a.Perform(make_tuple(3, UniqueInt(7), 9)));
+ tuple<int, double, const int&> dummy = make_tuple(3, 7.3, 9);
+ EXPECT_EQ(6, a.Perform(dummy));
}
// Test that basic built-in actions work with move-only arguments.