diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-10-05 16:23:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-05 16:23:55 -0400 |
| commit | 3149e0e88bf09841009851a478dd835fc557aaa1 (patch) | |
| tree | 22e38a6ba9e82b964f620f55cddb03033e1ffc4b /googlemock/test/gmock-spec-builders_test.cc | |
| parent | 4b82df5bb3fab5f6f19a41b7a232f54e37a66d6b (diff) | |
| parent | 40f82ce56a4b416aa4631e48d1d07377793b18ee (diff) | |
| download | googletest-3149e0e88bf09841009851a478dd835fc557aaa1.tar.gz googletest-3149e0e88bf09841009851a478dd835fc557aaa1.tar.bz2 googletest-3149e0e88bf09841009851a478dd835fc557aaa1.zip | |
Merge branch 'master' into python3-tests
Diffstat (limited to 'googlemock/test/gmock-spec-builders_test.cc')
| -rw-r--r-- | googlemock/test/gmock-spec-builders_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/googlemock/test/gmock-spec-builders_test.cc b/googlemock/test/gmock-spec-builders_test.cc index 7056c43c..65c9fcc4 100644 --- a/googlemock/test/gmock-spec-builders_test.cc +++ b/googlemock/test/gmock-spec-builders_test.cc @@ -2041,7 +2041,7 @@ TEST(FunctionCallMessageTest, GMOCK_FLAG(verbose) = kWarningVerbosity; NaggyMock<MockC> c; CaptureStdout(); - c.VoidMethod(false, 5, "Hi", NULL, Printable(), Unprintable()); + c.VoidMethod(false, 5, "Hi", nullptr, Printable(), Unprintable()); const std::string output = GetCapturedStdout(); EXPECT_PRED_FORMAT2(IsSubstring, "GMOCK WARNING", output); EXPECT_PRED_FORMAT2(IsNotSubstring, "Stack trace:", output); @@ -2055,7 +2055,7 @@ TEST(FunctionCallMessageTest, GMOCK_FLAG(verbose) = kInfoVerbosity; NaggyMock<MockC> c; CaptureStdout(); - c.VoidMethod(false, 5, "Hi", NULL, Printable(), Unprintable()); + c.VoidMethod(false, 5, "Hi", nullptr, Printable(), Unprintable()); const std::string output = GetCapturedStdout(); EXPECT_PRED_FORMAT2(IsSubstring, "GMOCK WARNING", output); EXPECT_PRED_FORMAT2(IsSubstring, "Stack trace:", output); @@ -2098,7 +2098,7 @@ TEST(FunctionCallMessageTest, // A void mock function. NaggyMock<MockC> c; CaptureStdout(); - c.VoidMethod(false, 5, "Hi", NULL, Printable(), Unprintable()); + c.VoidMethod(false, 5, "Hi", nullptr, Printable(), Unprintable()); const std::string output2 = GetCapturedStdout(); EXPECT_THAT(output2.c_str(), ContainsRegex( |