lianetm commented on code in PR #16200:
URL: https://github.com/apache/kafka/pull/16200#discussion_r1668797551


##########
clients/src/test/java/org/apache/kafka/clients/consumer/internals/HeartbeatRequestManagerTest.java:
##########
@@ -251,23 +304,25 @@ public void testSkippingHeartbeat(final boolean 
shouldSkipHeartbeat) {
 
     @Test
     public void testTimerNotDue() {
-        mockStableMember();
         time.sleep(100); // time elapsed < heartbeatInterval, no heartbeat 
should be sent
         NetworkClientDelegate.PollResult result = 
heartbeatRequestManager.poll(time.milliseconds());
+
         assertEquals(0, result.unsentRequests.size());
         assertEquals(DEFAULT_HEARTBEAT_INTERVAL_MS - 100, 
result.timeUntilNextPollMs);
+
+        when(pollTimer.remainingMs()).thenReturn(1800L);
         assertEquals(DEFAULT_HEARTBEAT_INTERVAL_MS - 100, 
heartbeatRequestManager.maximumTimeToWait(time.milliseconds()));
 
         // Member in state where it should not send Heartbeat anymore
         when(subscriptions.hasAutoAssignedPartitions()).thenReturn(true);

Review Comment:
   I would dare to say that we shouldn't need this now that we don't have a spy 
on `membershipMgr` anymore (it was there were this is used for several 
assignment/callbacks checks, not at the HB mgr level)



##########
clients/src/test/java/org/apache/kafka/clients/consumer/internals/HeartbeatRequestManagerTest.java:
##########
@@ -251,23 +304,25 @@ public void testSkippingHeartbeat(final boolean 
shouldSkipHeartbeat) {
 
     @Test
     public void testTimerNotDue() {
-        mockStableMember();
         time.sleep(100); // time elapsed < heartbeatInterval, no heartbeat 
should be sent
         NetworkClientDelegate.PollResult result = 
heartbeatRequestManager.poll(time.milliseconds());
+
         assertEquals(0, result.unsentRequests.size());
         assertEquals(DEFAULT_HEARTBEAT_INTERVAL_MS - 100, 
result.timeUntilNextPollMs);
+
+        when(pollTimer.remainingMs()).thenReturn(1800L);
         assertEquals(DEFAULT_HEARTBEAT_INTERVAL_MS - 100, 
heartbeatRequestManager.maximumTimeToWait(time.milliseconds()));
 
         // Member in state where it should not send Heartbeat anymore
         when(subscriptions.hasAutoAssignedPartitions()).thenReturn(true);
+        when(membershipManager.shouldSkipHeartbeat()).thenReturn(true);
         membershipManager.transitionToFatal();

Review Comment:
   we shouldn't need this explicit call on the mock now (it's replaced by the 
`shouldSkipHeartbeat` expectation you already set above). 



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: jira-unsubscr...@kafka.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

Reply via email to