From ef75ffb65c5f27f465d45ec698c1cc695ec9dbdb Mon Sep 17 00:00:00 2001 From: Taylor Barrella Date: Fri, 18 Sep 2020 15:52:38 -0700 Subject: [PATCH] Replace old MOCK_METHOD macros As recommended in https://github.com/google/googletest/blob/release-1.10.0/googlemock/docs/cook_book.md#old-style-mock_methodn-macros Signed-off-by: Taylor Barrella --- test/extensions/filters/common/lua/lua_wrappers.h | 2 +- test/mocks/stats/mocks.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/extensions/filters/common/lua/lua_wrappers.h b/test/extensions/filters/common/lua/lua_wrappers.h index b6664b7e7c18..8dfcc0d07fe9 100644 --- a/test/extensions/filters/common/lua/lua_wrappers.h +++ b/test/extensions/filters/common/lua/lua_wrappers.h @@ -19,7 +19,7 @@ namespace Lua { // A helper to be called inside the registered closure. class Printer { public: - MOCK_CONST_METHOD1(testPrint, void(const std::string&)); + MOCK_METHOD(void, testPrint, (const std::string&), (const)); }; const Printer& getPrinter() { CONSTRUCT_ON_FIRST_USE(Printer); } diff --git a/test/mocks/stats/mocks.h b/test/mocks/stats/mocks.h index 272603041d98..6266ae6e2aec 100644 --- a/test/mocks/stats/mocks.h +++ b/test/mocks/stats/mocks.h @@ -264,9 +264,9 @@ class MockTextReadout : public MockMetric { MockTextReadout(); ~MockTextReadout() override; - MOCK_METHOD1(set, void(absl::string_view value)); - MOCK_CONST_METHOD0(used, bool()); - MOCK_CONST_METHOD0(value, std::string()); + MOCK_METHOD(void, set, (absl::string_view value), (override)); + MOCK_METHOD(bool, used, (), (const, override)); + MOCK_METHOD(std::string, value, (), (const, override)); bool used_; std::string value_;