commit 453a08929333234e3c3a2ff0dabdf135a01a048e
author Lei Zhang <thestig@chromium.org> Mon Jul 01 17:06:59 2024 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Jul 01 17:06:59 2024 +0000
tree 3b8e8b5e8f64335dfd78cb23d0a1cdf28b96f575
parent 37dd7ee9f6f3cd0a06529dfcb7d699ec105107c3

Convert MOCK_METHODn() to MOCK_METHOD()

Stop using old-style macros.

Change-Id: I99159d972784b1c2a9a913c23384327e5d109397
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/121235
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Tom Sepez <tsepez@google.com>
Commit-Queue: Lei Zhang <thestig@chromium.org>

core/fpdfapi/parser/cpdf_indirect_object_holder_unittest.cpp

diff --git a/core/fpdfapi/parser/cpdf_indirect_object_holder_unittest.cpp b/core/fpdfapi/parser/cpdf_indirect_object_holder_unittest.cpp
index 0fb2607..6905d5a 100644
--- a/core/fpdfapi/parser/cpdf_indirect_object_holder_unittest.cpp
+++ b/core/fpdfapi/parser/cpdf_indirect_object_holder_unittest.cpp
@@ -18,7 +18,7 @@
   MockIndirectObjectHolder() = default;
   ~MockIndirectObjectHolder() override = default;
 
-  MOCK_METHOD1(ParseIndirectObject, RetainPtr<CPDF_Object>(uint32_t objnum));
+  MOCK_METHOD(RetainPtr<CPDF_Object>, ParseIndirectObject, (uint32_t objnum));
 };
 
 }  // namespace

core/fpdfapi/parser/cpdf_parser_unittest.cpp

diff --git a/core/fpdfapi/parser/cpdf_parser_unittest.cpp b/core/fpdfapi/parser/cpdf_parser_unittest.cpp
index b7c4523..f915e26 100644
--- a/core/fpdfapi/parser/cpdf_parser_unittest.cpp
+++ b/core/fpdfapi/parser/cpdf_parser_unittest.cpp
@@ -49,7 +49,7 @@
 
   // CPDF_Parser::ParsedObjectsHolder:
   bool TryInit() override { return true; }
-  MOCK_METHOD1(ParseIndirectObject, RetainPtr<CPDF_Object>(uint32_t objnum));
+  MOCK_METHOD(RetainPtr<CPDF_Object>, ParseIndirectObject, (uint32_t objnum));
 };
 
 }  // namespace

core/fxcrt/cfx_timer_unittest.cpp

diff --git a/core/fxcrt/cfx_timer_unittest.cpp b/core/fxcrt/cfx_timer_unittest.cpp
index 360dbb2..2e9b12d 100644
--- a/core/fxcrt/cfx_timer_unittest.cpp
+++ b/core/fxcrt/cfx_timer_unittest.cpp
@@ -18,13 +18,13 @@
 
 class MockTimerScheduler : public CFX_Timer::HandlerIface {
  public:
-  MOCK_METHOD2(SetTimer, int(int32_t uElapse, TimerCallback lpTimerFunc));
-  MOCK_METHOD1(KillTimer, void(int32_t nID));
+  MOCK_METHOD(int, SetTimer, (int32_t uElapse, TimerCallback lpTimerFunc));
+  MOCK_METHOD(void, KillTimer, (int32_t nID));
 };
 
 class MockTimerCallback : public CFX_Timer::CallbackIface {
  public:
-  MOCK_METHOD0(OnTimerFired, void());
+  MOCK_METHOD(void, OnTimerFired, ());
 };
 
 }  // namespace

testing/embedder_test_mock_delegate.h

diff --git a/testing/embedder_test_mock_delegate.h b/testing/embedder_test_mock_delegate.h
index 7309541..88f40b3 100644
--- a/testing/embedder_test_mock_delegate.h
+++ b/testing/embedder_test_mock_delegate.h
@@ -10,27 +10,29 @@
 
 class EmbedderTestMockDelegate : public EmbedderTest::Delegate {
  public:
-  MOCK_METHOD1(UnsupportedHandler, void(int type));
-  MOCK_METHOD4(
+  MOCK_METHOD(void, UnsupportedHandler, (int type));
+  MOCK_METHOD(
+      int,
       Alert,
-      int(FPDF_WIDESTRING message, FPDF_WIDESTRING title, int type, int icon));
-  MOCK_METHOD2(SetTimer, int(int msecs, TimerCallback fn));
-  MOCK_METHOD1(KillTimer, void(int msecs));
-  MOCK_METHOD1(DoURIAction, void(FPDF_BYTESTRING uri));
-  MOCK_METHOD5(DoGoToAction,
-               void(FPDF_FORMFILLINFO* info,
-                    int page_index,
-                    int zoom_mode,
-                    float* pos_array,
-                    int array_size));
-  MOCK_METHOD3(OnFocusChange,
-               void(FPDF_FORMFILLINFO* info,
-                    FPDF_ANNOTATION annot,
-                    int page_index));
-  MOCK_METHOD3(DoURIActionWithKeyboardModifier,
-               void(FPDF_FORMFILLINFO* info,
-                    FPDF_BYTESTRING uri,
-                    int modifiers));
+      (FPDF_WIDESTRING message, FPDF_WIDESTRING title, int type, int icon));
+  MOCK_METHOD(int, SetTimer, (int msecs, TimerCallback fn));
+  MOCK_METHOD(void, KillTimer, (int msecs));
+  MOCK_METHOD(void, DoURIAction, (FPDF_BYTESTRING uri));
+  MOCK_METHOD(void,
+              DoGoToAction,
+              (FPDF_FORMFILLINFO * info,
+               int page_index,
+               int zoom_mode,
+               float* pos_array,
+               int array_size));
+  MOCK_METHOD(void,
+              OnFocusChange,
+              (FPDF_FORMFILLINFO * info,
+               FPDF_ANNOTATION annot,
+               int page_index));
+  MOCK_METHOD(void,
+              DoURIActionWithKeyboardModifier,
+              (FPDF_FORMFILLINFO * info, FPDF_BYTESTRING uri, int modifiers));
 };
 
 #endif  // TESTING_EMBEDDER_TEST_MOCK_DELEGATE_H_