[statsd] Updated StatsBufferWriterQueueTest#TestSleepOnOverflow

- fixed the mock argument type
- updated the mock API implementation

Bug: 329917131
Test: atest StatsBufferWriterQueueTest#TestSleepOnOverflow --rerun-until-failure 200
Change-Id: I16d9daddbb616afb9199dbe18ed6cc1a323216b2

1 files changed, 13 insertions, 8 deletions

diff --git a/lib/libstatssocket/tests/stats_buffer_writer_queue_test.cpp b/lib/libstatssocket/tests/stats_buffer_writer_queue_test.cpp
index 44224c51..eff4cfe6 100644
--- a/lib/libstatssocket/tests/stats_buffer_writer_queue_test.cpp
+++ b/lib/libstatssocket/tests/stats_buffer_writer_queue_test.cpp
@@ -24,6 +24,8 @@
 #include "utils.h"
 
 using testing::_;
+using testing::AnyNumber;
+using testing::DoAll;
 using testing::Return;
 using testing::StrictMock;
 
@@ -40,8 +42,7 @@ static AStatsEvent* generateTestEvent() {
 class BasicBufferWriterQueueMock : public BufferWriterQueue {
 public:
     BasicBufferWriterQueueMock() = default;
-    MOCK_METHOD(bool, handleCommand, (const BasicBufferWriterQueueMock::Cmd& cmd),
-                (const override));
+    MOCK_METHOD(bool, handleCommand, (const BufferWriterQueue::Cmd& cmd), (const override));
 };
 
 typedef StrictMock<BasicBufferWriterQueueMock> BufferWriterQueueMock;
@@ -104,12 +105,16 @@ TEST(StatsBufferWriterQueueTest, TestSleepOnOverflow) {
     std::vector<int64_t> attemptsTs;
 
     BufferWriterQueueMock queue;
-    EXPECT_CALL(queue, handleCommand(_))
-            .WillRepeatedly([&attemptsTs](const BufferWriterQueueMock::Cmd&) {
-                // store timestamp for command handler invocations
-                attemptsTs.push_back(get_elapsed_realtime_ns());
-                return false;
-            });
+    ON_CALL(queue, handleCommand(_))
+            .WillByDefault(DoAll(
+                    [&attemptsTs](const BufferWriterQueue::Cmd&) {
+                        // store timestamp for command handler invocations
+                        attemptsTs.push_back(get_elapsed_realtime_ns());
+                        return false;
+                    },
+                    Return(false)));
+
+    EXPECT_CALL(queue, handleCommand(_)).Times(AnyNumber());
 
     // simulate failed write to stats socket to fill the queue
     for (int i = 0; i < BufferWriterQueueMock::kQueueMaxSizeLimit; i++) {