From a2d3e8b2d5f8f3de06eefec50566c9a54d7cf0a6 Mon Sep 17 00:00:00 2001 From: Joshua Peraza Date: Thu, 16 Apr 2020 11:56:40 -0700 Subject: Use stdint.h numeric types in tests Change-Id: Iaa79c5c7c70ca953256cd39cc9f6f4f139c696af Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/2153567 Reviewed-by: Mike Frysinger --- src/common/dwarf/dwarf2diehandler_unittest.cc | 29 +++++++++++++------------- src/common/dwarf/dwarf2reader_cfi_unittest.cc | 30 ++++++++++++++------------- src/common/dwarf/dwarf2reader_die_unittest.cc | 2 +- 3 files changed, 32 insertions(+), 29 deletions(-) (limited to 'src') diff --git a/src/common/dwarf/dwarf2diehandler_unittest.cc b/src/common/dwarf/dwarf2diehandler_unittest.cc index db70eb31..01b70489 100644 --- a/src/common/dwarf/dwarf2diehandler_unittest.cc +++ b/src/common/dwarf/dwarf2diehandler_unittest.cc @@ -63,41 +63,42 @@ using dwarf2reader::RootDIEHandler; class MockDIEHandler: public DIEHandler { public: MOCK_METHOD3(ProcessAttributeUnsigned, - void(DwarfAttribute, DwarfForm, uint64)); + void(DwarfAttribute, DwarfForm, uint64_t)); MOCK_METHOD3(ProcessAttributeSigned, - void(DwarfAttribute, DwarfForm, int64)); + void(DwarfAttribute, DwarfForm, int64_t)); MOCK_METHOD3(ProcessAttributeReference, - void(DwarfAttribute, DwarfForm, uint64)); + void(DwarfAttribute, DwarfForm, uint64_t)); MOCK_METHOD4(ProcessAttributeBuffer, - void(DwarfAttribute, DwarfForm, const uint8_t *, uint64)); + void(DwarfAttribute, DwarfForm, const uint8_t *, uint64_t)); MOCK_METHOD3(ProcessAttributeString, void(DwarfAttribute, DwarfForm, const string &)); MOCK_METHOD3(ProcessAttributeSignature, - void(DwarfAttribute, DwarfForm, uint64)); + void(DwarfAttribute, DwarfForm, uint64_t)); MOCK_METHOD0(EndAttributes, bool()); - MOCK_METHOD2(FindChildHandler, DIEHandler *(uint64, DwarfTag)); + MOCK_METHOD2(FindChildHandler, DIEHandler *(uint64_t, DwarfTag)); MOCK_METHOD0(Finish, void()); }; class MockRootDIEHandler: public RootDIEHandler { public: MOCK_METHOD3(ProcessAttributeUnsigned, - void(DwarfAttribute, DwarfForm, uint64)); + void(DwarfAttribute, DwarfForm, uint64_t)); MOCK_METHOD3(ProcessAttributeSigned, - void(DwarfAttribute, DwarfForm, int64)); + void(DwarfAttribute, DwarfForm, int64_t)); MOCK_METHOD3(ProcessAttributeReference, - void(DwarfAttribute, DwarfForm, uint64)); + void(DwarfAttribute, DwarfForm, uint64_t)); MOCK_METHOD4(ProcessAttributeBuffer, - void(DwarfAttribute, DwarfForm, const uint8_t *, uint64)); + void(DwarfAttribute, DwarfForm, const uint8_t *, uint64_t)); MOCK_METHOD3(ProcessAttributeString, void(DwarfAttribute, DwarfForm, const string &)); MOCK_METHOD3(ProcessAttributeSignature, - void(DwarfAttribute, DwarfForm, uint64)); + void(DwarfAttribute, DwarfForm, uint64_t)); MOCK_METHOD0(EndAttributes, bool()); - MOCK_METHOD2(FindChildHandler, DIEHandler *(uint64, DwarfTag)); + MOCK_METHOD2(FindChildHandler, DIEHandler *(uint64_t, DwarfTag)); MOCK_METHOD0(Finish, void()); - MOCK_METHOD5(StartCompilationUnit, bool(uint64, uint8, uint8, uint64, uint8)); - MOCK_METHOD2(StartRootDIE, bool(uint64, DwarfTag)); + MOCK_METHOD5(StartCompilationUnit, bool(uint64_t, uint8_t, uint8_t, uint64_t, + uint8_t)); + MOCK_METHOD2(StartRootDIE, bool(uint64_t, DwarfTag)); }; // If the handler elects to skip the compilation unit, the dispatcher diff --git a/src/common/dwarf/dwarf2reader_cfi_unittest.cc b/src/common/dwarf/dwarf2reader_cfi_unittest.cc index 5df6d8f0..ebe612e1 100644 --- a/src/common/dwarf/dwarf2reader_cfi_unittest.cc +++ b/src/common/dwarf/dwarf2reader_cfi_unittest.cc @@ -122,20 +122,22 @@ class MockCallFrameInfoHandler: public CallFrameInfo::Handler { class MockCallFrameErrorReporter: public CallFrameInfo::Reporter { public: MockCallFrameErrorReporter() : Reporter("mock filename", "mock section") { } - MOCK_METHOD2(Incomplete, void(uint64, CallFrameInfo::EntryKind)); - MOCK_METHOD1(EarlyEHTerminator, void(uint64)); - MOCK_METHOD2(CIEPointerOutOfRange, void(uint64, uint64)); - MOCK_METHOD2(BadCIEId, void(uint64, uint64)); - MOCK_METHOD2(UnexpectedAddressSize, void(uint64, uint8_t)); - MOCK_METHOD2(UnexpectedSegmentSize, void(uint64, uint8_t)); - MOCK_METHOD2(UnrecognizedVersion, void(uint64, int version)); - MOCK_METHOD2(UnrecognizedAugmentation, void(uint64, const string &)); - MOCK_METHOD2(InvalidPointerEncoding, void(uint64, uint8)); - MOCK_METHOD2(UnusablePointerEncoding, void(uint64, uint8)); - MOCK_METHOD2(RestoreInCIE, void(uint64, uint64)); - MOCK_METHOD3(BadInstruction, void(uint64, CallFrameInfo::EntryKind, uint64)); - MOCK_METHOD3(NoCFARule, void(uint64, CallFrameInfo::EntryKind, uint64)); - MOCK_METHOD3(EmptyStateStack, void(uint64, CallFrameInfo::EntryKind, uint64)); + MOCK_METHOD2(Incomplete, void(uint64_t, CallFrameInfo::EntryKind)); + MOCK_METHOD1(EarlyEHTerminator, void(uint64_t)); + MOCK_METHOD2(CIEPointerOutOfRange, void(uint64_t, uint64_t)); + MOCK_METHOD2(BadCIEId, void(uint64_t, uint64_t)); + MOCK_METHOD2(UnexpectedAddressSize, void(uint64_t, uint8_t)); + MOCK_METHOD2(UnexpectedSegmentSize, void(uint64_t, uint8_t)); + MOCK_METHOD2(UnrecognizedVersion, void(uint64_t, int version)); + MOCK_METHOD2(UnrecognizedAugmentation, void(uint64_t, const string &)); + MOCK_METHOD2(InvalidPointerEncoding, void(uint64_t, uint8_t)); + MOCK_METHOD2(UnusablePointerEncoding, void(uint64_t, uint8_t)); + MOCK_METHOD2(RestoreInCIE, void(uint64_t, uint64_t)); + MOCK_METHOD3(BadInstruction, void(uint64_t, CallFrameInfo::EntryKind, + uint64_t)); + MOCK_METHOD3(NoCFARule, void(uint64_t, CallFrameInfo::EntryKind, uint64_t)); + MOCK_METHOD3(EmptyStateStack, void(uint64_t, CallFrameInfo::EntryKind, + uint64_t)); }; struct CFIFixture { diff --git a/src/common/dwarf/dwarf2reader_die_unittest.cc b/src/common/dwarf/dwarf2reader_die_unittest.cc index c7031a3a..ca44cad0 100644 --- a/src/common/dwarf/dwarf2reader_die_unittest.cc +++ b/src/common/dwarf/dwarf2reader_die_unittest.cc @@ -85,7 +85,7 @@ class MockDwarf2Handler: public Dwarf2Handler { MOCK_METHOD4(ProcessAttributeSigned, void(uint64_t offset, enum DwarfAttribute attr, enum DwarfForm form, - int64 data)); + int64_t data)); MOCK_METHOD4(ProcessAttributeReference, void(uint64_t offset, enum DwarfAttribute attr, enum DwarfForm form, -- cgit v1.2.1