From 04ce8521f481d857db1aa00a206278759b9b0381 Mon Sep 17 00:00:00 2001 From: kosak Date: Sun, 12 Jan 2014 23:42:34 +0000 Subject: Adds a note in the "uninteresting mock method call" warning to advise people how to handle the warning. Clarifies the purpose of utilities in gmock-port.h and adds guidance w.r.t. gmock-port.h vs gtest-port.h. Pulls in gtest r674. --- test/gmock-spec-builders_test.cc | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'test/gmock-spec-builders_test.cc') diff --git a/test/gmock-spec-builders_test.cc b/test/gmock-spec-builders_test.cc index 843681cf..ae811498 100644 --- a/test/gmock-spec-builders_test.cc +++ b/test/gmock-spec-builders_test.cc @@ -2088,6 +2088,12 @@ class GMockVerboseFlagTest : public VerboseFlagPreservingFixture { // Tests how the flag affects uninteresting calls on a naggy mock. void TestUninterestingCallOnNaggyMock(bool should_print) { NaggyMock a; + const string note = + "NOTE: You can safely ignore the above warning unless this " + "call should not happen. Do not suppress it by blindly adding " + "an EXPECT_CALL() if you don't mean to enforce the call. " + "See http://code.google.com/p/googlemock/wiki/CookBook#" + "Knowing_When_to_Expect for details."; // A void-returning function. CaptureStdout(); @@ -2097,8 +2103,9 @@ class GMockVerboseFlagTest : public VerboseFlagPreservingFixture { should_print, "\nGMOCK WARNING:\n" "Uninteresting mock function call - returning directly.\n" - " Function call: DoA(5)\n" - "Stack trace:\n", + " Function call: DoA(5)\n" + + note + + "\nStack trace:\n", "DoA"); // A non-void-returning function. @@ -2110,8 +2117,9 @@ class GMockVerboseFlagTest : public VerboseFlagPreservingFixture { "\nGMOCK WARNING:\n" "Uninteresting mock function call - returning default value.\n" " Function call: Binary(2, 1)\n" - " Returns: false\n" - "Stack trace:\n", + " Returns: false\n" + + note + + "\nStack trace:\n", "Binary"); } }; -- cgit v1.2.3