diff options
| author | Jerry Turcios <jerryturcios08@gmail.com> | 2018-10-07 23:09:07 -0400 |
|---|---|---|
| committer | Jerry Turcios <jerryturcios08@gmail.com> | 2018-10-07 23:09:07 -0400 |
| commit | 4327d95b3e5e13aab0d2edcf6cc7d2060f83f89a (patch) | |
| tree | f33a48a60c4b6c3d0c7ea58588af56ddefce1051 /googlemock/test/gmock-generated-function-mockers_test.cc | |
| parent | 7caf5ffd1dc8db7625b393a36846471e5c5f45e3 (diff) | |
| parent | 40f82ce56a4b416aa4631e48d1d07377793b18ee (diff) | |
| download | googletest-4327d95b3e5e13aab0d2edcf6cc7d2060f83f89a.tar.gz googletest-4327d95b3e5e13aab0d2edcf6cc7d2060f83f89a.tar.bz2 googletest-4327d95b3e5e13aab0d2edcf6cc7d2060f83f89a.zip | |
Merge branch 'master' of https://github.com/google/googletest
Diffstat (limited to 'googlemock/test/gmock-generated-function-mockers_test.cc')
| -rw-r--r-- | googlemock/test/gmock-generated-function-mockers_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/test/gmock-generated-function-mockers_test.cc b/googlemock/test/gmock-generated-function-mockers_test.cc index 4c490694..820a2b69 100644 --- a/googlemock/test/gmock-generated-function-mockers_test.cc +++ b/googlemock/test/gmock-generated-function-mockers_test.cc @@ -228,7 +228,7 @@ TEST_F(FunctionMockerTest, MocksDecimalFunction) { Lt(100), 5U, NULL, "hi")) .WillOnce(Return(5)); - EXPECT_EQ(5, foo_->Decimal(true, 'a', 0, 0, 1, 0, 0, 5, NULL, "hi")); + EXPECT_EQ(5, foo_->Decimal(true, 'a', 0, 0, 1, 0, 0, 5, nullptr, "hi")); } // Tests mocking a function that takes a non-const reference. |