Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3902531b authored by Christopher Ferris's avatar Christopher Ferris Committed by Gerrit Code Review
Browse files

Merge "Replace MOCK_METHODN with MOCK_METHOD macro."

parents 212b8247 baf058bb

libunwindstack/tests/DwarfSectionTest.cpp

+10 −9
Original line number Diff line number Diff line
@@ -30,23 +30,24 @@ class MockDwarfSection : public DwarfSection { 
  MockDwarfSection(Memory* memory) : DwarfSection(memory) {}

  virtual ~MockDwarfSection() = default;



  MOCK_METHOD3(Init, bool(uint64_t, uint64_t, int64_t));

  MOCK_METHOD(bool, Init, (uint64_t, uint64_t, int64_t), (override));



  MOCK_METHOD5(Eval, bool(const DwarfCie*, Memory*, const dwarf_loc_regs_t&, Regs*, bool*));

  MOCK_METHOD(bool, Eval, (const DwarfCie*, Memory*, const dwarf_loc_regs_t&, Regs*, bool*),

              (override));



  MOCK_METHOD3(Log, bool(uint8_t, uint64_t, const DwarfFde*));

  MOCK_METHOD(bool, Log, (uint8_t, uint64_t, const DwarfFde*), (override));



  MOCK_METHOD1(GetFdes, void(std::vector<const DwarfFde*>*));

  MOCK_METHOD(void, GetFdes, (std::vector<const DwarfFde*>*), (override));



  MOCK_METHOD1(GetFdeFromPc, const DwarfFde*(uint64_t));

  MOCK_METHOD(const DwarfFde*, GetFdeFromPc, (uint64_t), (override));



  MOCK_METHOD3(GetCfaLocationInfo, bool(uint64_t, const DwarfFde*, dwarf_loc_regs_t*));

  MOCK_METHOD(bool, GetCfaLocationInfo, (uint64_t, const DwarfFde*, dwarf_loc_regs_t*), (override));



  MOCK_METHOD1(GetCieOffsetFromFde32, uint64_t(uint32_t));

  MOCK_METHOD(uint64_t, GetCieOffsetFromFde32, (uint32_t), (override));



  MOCK_METHOD1(GetCieOffsetFromFde64, uint64_t(uint64_t));

  MOCK_METHOD(uint64_t, GetCieOffsetFromFde64, (uint64_t), (override));



  MOCK_METHOD1(AdjustPcFromFde, uint64_t(uint64_t));

  MOCK_METHOD(uint64_t, AdjustPcFromFde, (uint64_t), (override));

};



class DwarfSectionTest : public ::testing::Test {

libunwindstack/tests/ElfTest.cpp

+3 −3
Original line number Diff line number Diff line
@@ -316,9 +316,9 @@ class ElfInterfaceMock : public ElfInterface { 
  bool GetFunctionName(uint64_t, std::string*, uint64_t*) override { return false; }

  std::string GetBuildID() override { return ""; }



  MOCK_METHOD4(Step, bool(uint64_t, Regs*, Memory*, bool*));

  MOCK_METHOD2(GetGlobalVariable, bool(const std::string&, uint64_t*));

  MOCK_METHOD1(IsValidPc, bool(uint64_t));

  MOCK_METHOD(bool, Step, (uint64_t, Regs*, Memory*, bool*), (override));

  MOCK_METHOD(bool, GetGlobalVariable, (const std::string&, uint64_t*), (override));

  MOCK_METHOD(bool, IsValidPc, (uint64_t), (override));



  void MockSetDynamicOffset(uint64_t offset) { dynamic_offset_ = offset; }

  void MockSetDynamicVaddr(uint64_t vaddr) { dynamic_vaddr_ = vaddr; }