From 54e75078d68bdae6aa45395f1e141e92bf5b275a Mon Sep 17 00:00:00 2001 From: "ted.mielczarek@gmail.com" Date: Fri, 17 May 2013 14:51:46 +0000 Subject: [PATCH] Avoid gmock warning "Uninteresting mock function call" Patch by Michael Krebs , R=me at https://breakpad.appspot.com/397002/ git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1183 4c0a9323-5329-0410-9bdc-e9ce6186880e --- src/processor/minidump_processor_unittest.cc | 7 +++++++ src/processor/stackwalker_amd64_unittest.cc | 5 +++++ src/processor/stackwalker_arm_unittest.cc | 5 +++++ src/processor/stackwalker_x86_unittest.cc | 5 +++++ 4 files changed, 22 insertions(+) diff --git a/src/processor/minidump_processor_unittest.cc b/src/processor/minidump_processor_unittest.cc index 562c0f93..b80c04aa 100644 --- a/src/processor/minidump_processor_unittest.cc +++ b/src/processor/minidump_processor_unittest.cc @@ -139,6 +139,7 @@ using google_breakpad::scoped_ptr; using google_breakpad::SymbolSupplier; using google_breakpad::SystemInfo; using ::testing::_; +using ::testing::AnyNumber; using ::testing::DoAll; using ::testing::Mock; using ::testing::Ne; @@ -340,6 +341,9 @@ TEST_F(MinidumpProcessorTest, TestSymbolSupplierLookupCounts) { Property(&google_breakpad::CodeModule::code_file, Ne("c:\\test_app.exe")), _, _, _)).WillRepeatedly(Return(SymbolSupplier::NOT_FOUND)); + // Avoid GMOCK WARNING "Uninteresting mock function call - returning + // directly" for FreeSymbolData(). + EXPECT_CALL(supplier, FreeSymbolData(_)).Times(AnyNumber()); ASSERT_EQ(processor.Process(minidump_file, &state), google_breakpad::PROCESS_OK); @@ -355,6 +359,9 @@ TEST_F(MinidumpProcessorTest, TestSymbolSupplierLookupCounts) { Property(&google_breakpad::CodeModule::code_file, Ne("c:\\test_app.exe")), _, _, _)).WillRepeatedly(Return(SymbolSupplier::NOT_FOUND)); + // Avoid GMOCK WARNING "Uninteresting mock function call - returning + // directly" for FreeSymbolData(). + EXPECT_CALL(supplier, FreeSymbolData(_)).Times(AnyNumber()); ASSERT_EQ(processor.Process(minidump_file, &state), google_breakpad::PROCESS_OK); } diff --git a/src/processor/stackwalker_amd64_unittest.cc b/src/processor/stackwalker_amd64_unittest.cc index 8faf09ab..a0175a9b 100644 --- a/src/processor/stackwalker_amd64_unittest.cc +++ b/src/processor/stackwalker_amd64_unittest.cc @@ -60,6 +60,7 @@ using google_breakpad::test_assembler::Label; using google_breakpad::test_assembler::Section; using std::vector; using testing::_; +using testing::AnyNumber; using testing::Return; using testing::SetArgumentPointee; using testing::Test; @@ -90,6 +91,10 @@ class StackwalkerAMD64Fixture { // SetModuleSymbols to override this. EXPECT_CALL(supplier, GetCStringSymbolData(_, _, _, _)) .WillRepeatedly(Return(MockSymbolSupplier::NOT_FOUND)); + + // Avoid GMOCK WARNING "Uninteresting mock function call - returning + // directly" for FreeSymbolData(). + EXPECT_CALL(supplier, FreeSymbolData(_)).Times(AnyNumber()); } // Set the Breakpad symbol information that supplier should return for diff --git a/src/processor/stackwalker_arm_unittest.cc b/src/processor/stackwalker_arm_unittest.cc index 588b5c5f..29deac87 100644 --- a/src/processor/stackwalker_arm_unittest.cc +++ b/src/processor/stackwalker_arm_unittest.cc @@ -62,6 +62,7 @@ using google_breakpad::test_assembler::Label; using google_breakpad::test_assembler::Section; using std::vector; using testing::_; +using testing::AnyNumber; using testing::Return; using testing::SetArgumentPointee; using testing::Test; @@ -92,6 +93,10 @@ class StackwalkerARMFixture { // SetModuleSymbols to override this. EXPECT_CALL(supplier, GetCStringSymbolData(_, _, _, _)) .WillRepeatedly(Return(MockSymbolSupplier::NOT_FOUND)); + + // Avoid GMOCK WARNING "Uninteresting mock function call - returning + // directly" for FreeSymbolData(). + EXPECT_CALL(supplier, FreeSymbolData(_)).Times(AnyNumber()); } // Set the Breakpad symbol information that supplier should return for diff --git a/src/processor/stackwalker_x86_unittest.cc b/src/processor/stackwalker_x86_unittest.cc index caf899e6..8a6b26e5 100644 --- a/src/processor/stackwalker_x86_unittest.cc +++ b/src/processor/stackwalker_x86_unittest.cc @@ -61,6 +61,7 @@ using google_breakpad::test_assembler::Label; using google_breakpad::test_assembler::Section; using std::vector; using testing::_; +using testing::AnyNumber; using testing::Return; using testing::SetArgumentPointee; using testing::Test; @@ -99,6 +100,10 @@ class StackwalkerX86Fixture { // SetModuleSymbols to override this. EXPECT_CALL(supplier, GetCStringSymbolData(_, _, _, _)) .WillRepeatedly(Return(MockSymbolSupplier::NOT_FOUND)); + + // Avoid GMOCK WARNING "Uninteresting mock function call - returning + // directly" for FreeSymbolData(). + EXPECT_CALL(supplier, FreeSymbolData(_)).Times(AnyNumber()); } // Set the Breakpad symbol information that supplier should return for