diff options
| author | Vadim Barkov <vbrkov@gmail.com> | 2018-10-28 03:27:51 +0300 |
|---|---|---|
| committer | Vadim Barkov <vbrkov@gmail.com> | 2018-10-28 03:27:51 +0300 |
| commit | 3feffddd1e8381209a48c24587e36e030051499f (patch) | |
| tree | 48b7c34ea4f12ab644eb9c9e203734796784325a /googlemock/test/gmock-generated-function-mockers_test.cc | |
| parent | 53d61b5b2382891386bfd41f797118de433b358c (diff) | |
| download | googletest-3feffddd1e8381209a48c24587e36e030051499f.tar.gz googletest-3feffddd1e8381209a48c24587e36e030051499f.zip | |
Replaced all NULLs with nullptr in googlemock
Diffstat (limited to 'googlemock/test/gmock-generated-function-mockers_test.cc')
| -rw-r--r-- | googlemock/test/gmock-generated-function-mockers_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/googlemock/test/gmock-generated-function-mockers_test.cc b/googlemock/test/gmock-generated-function-mockers_test.cc index 820a2b69..799790c2 100644 --- a/googlemock/test/gmock-generated-function-mockers_test.cc +++ b/googlemock/test/gmock-generated-function-mockers_test.cc @@ -225,7 +225,7 @@ TEST_F(FunctionMockerTest, MocksBinaryFunction) { // Tests mocking a decimal function. TEST_F(FunctionMockerTest, MocksDecimalFunction) { EXPECT_CALL(mock_foo_, Decimal(true, 'a', 0, 0, 1L, A<float>(), - Lt(100), 5U, NULL, "hi")) + Lt(100), 5U, nullptr, "hi")) .WillOnce(Return(5)); EXPECT_EQ(5, foo_->Decimal(true, 'a', 0, 0, 1, 0, 0, 5, nullptr, "hi")); @@ -327,10 +327,10 @@ TEST_F(FunctionMockerTest, MocksUnaryFunctionWithCallType) { // Tests mocking a decimal function with calltype. TEST_F(FunctionMockerTest, MocksDecimalFunctionWithCallType) { EXPECT_CALL(mock_foo_, CTDecimal(true, 'a', 0, 0, 1L, A<float>(), - Lt(100), 5U, NULL, "hi")) + Lt(100), 5U, nullptr, "hi")) .WillOnce(Return(10)); - EXPECT_EQ(10, foo_->CTDecimal(true, 'a', 0, 0, 1, 0, 0, 5, NULL, "hi")); + EXPECT_EQ(10, foo_->CTDecimal(true, 'a', 0, 0, 1, 0, 0, 5, nullptr, "hi")); } // Tests mocking functions overloaded on the const-ness of this object. |
