[arrow] branch master updated: ARROW-4869: [C++] Fix gmock usage in compute/kernels/util-internal-test.cc

[kszucs]

This is an automated email from the ASF dual-hosted git repository.

kszucs pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new 8d57332  ARROW-4869: [C++] Fix gmock usage in 
compute/kernels/util-internal-test.cc
8d57332 is described below

commit 8d573322a4eccbab0b3dedf75505d4b693a430c1
Author: Benjamin Kietzman <bengil...@gmail.com>
AuthorDate: Tue Mar 19 08:45:35 2019 +0100

    ARROW-4869: [C++] Fix gmock usage in compute/kernels/util-internal-test.cc
    
    The second argument to `EXPECT_CALL` must be a function call expression
    
    Author: Benjamin Kietzman <bengil...@gmail.com>
    
    Closes #3969 from bkietz/4869-Use-of-gmock-fails-in-compute-kernels-ut and 
squashes the following commits:
    
    ab6b3a89 <Benjamin Kietzman> second argument to EXPECT_CALL must be 
callexpr-like
---
 cpp/src/arrow/compute/kernels/util-internal-test.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cpp/src/arrow/compute/kernels/util-internal-test.cc 
b/cpp/src/arrow/compute/kernels/util-internal-test.cc
index 9f16344..8ce3569 100644
--- a/cpp/src/arrow/compute/kernels/util-internal-test.cc
+++ b/cpp/src/arrow/compute/kernels/util-internal-test.cc
@@ -149,7 +149,7 @@ TEST(AssignNullIntersection, IntersectsNullsWhenSomeOnBoth) 
{
 
 TEST(PrimitiveAllocatingUnaryKernel, BooleanFunction) {
   MockUnaryKernel mock;
-  EXPECT_CALL(mock, out_type).WillRepeatedly(Return(boolean()));
+  EXPECT_CALL(mock, out_type()).WillRepeatedly(Return(boolean()));
   EXPECT_CALL(mock, Call(_, _, _)).WillOnce(Return(Status::OK()));
   PrimitiveAllocatingUnaryKernel kernel(&mock);
 
@@ -170,7 +170,7 @@ TEST(PrimitiveAllocatingUnaryKernel, BooleanFunction) {
 
 TEST(PrimitiveAllocatingUnaryKernel, NonBoolean) {
   MockUnaryKernel mock;
-  EXPECT_CALL(mock, out_type).WillRepeatedly(Return(int32()));
+  EXPECT_CALL(mock, out_type()).WillRepeatedly(Return(int32()));
   EXPECT_CALL(mock, Call(_, _, _)).WillOnce(Return(Status::OK()));
   PrimitiveAllocatingUnaryKernel kernel(&mock);
 
@@ -189,7 +189,7 @@ TEST(PrimitiveAllocatingUnaryKernel, NonBoolean) {
 
 TEST(PrimitiveAllocatingBinaryKernel, BooleanFunction) {
   MockBinaryKernel mock;
-  EXPECT_CALL(mock, out_type).WillRepeatedly(Return(boolean()));
+  EXPECT_CALL(mock, out_type()).WillRepeatedly(Return(boolean()));
   EXPECT_CALL(mock, Call(_, _, _, _)).WillOnce(Return(Status::OK()));
   PrimitiveAllocatingBinaryKernel kernel(&mock);
 
@@ -210,7 +210,7 @@ TEST(PrimitiveAllocatingBinaryKernel, BooleanFunction) {
 
 TEST(PrimitiveAllocatingBinaryKernel, NonBoolean) {
   MockBinaryKernel mock;
-  EXPECT_CALL(mock, out_type).WillRepeatedly(Return(int32()));
+  EXPECT_CALL(mock, out_type()).WillRepeatedly(Return(int32()));
   EXPECT_CALL(mock, Call(_, _, _, _)).WillOnce(Return(Status::OK()));
   PrimitiveAllocatingBinaryKernel kernel(&mock);