(kafka) branch trunk updated: KAFKA-20323: Refactor deleteRecords stub to use partition-based matching for Mockito upgrade (#21857)

[schofielaj]

This is an automated email from the ASF dual-hosted git repository.

schofielaj pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 30edb584cce KAFKA-20323: Refactor deleteRecords stub to use 
partition-based matching for Mockito upgrade (#21857)
30edb584cce is described below

commit 30edb584cce2b469ef46e044c2d240dfc7b84a8a
Author: Mingi Cho <81455273+chomi...@users.noreply.github.com>
AuthorDate: Fri Apr 10 20:08:19 2026 +0900

    KAFKA-20323: Refactor deleteRecords stub to use partition-based matching 
for Mockito upgrade (#21857)
    
    `testRecordPruningTaskPeriodicityWithSomeFailures` fails with Mockito
    5.21+ because  unstubbed `CompletableFuture` methods now
    return`completedFuture(null)` instead of `null`, so unstubbed
    `deleteRecords` calls succeed instead of being no-ops.
    
    Changed `deleteRecords` stubs from offset-based matching to
    partition-based matching, which better reflects the test intent (tp1
    succeeds, tp2 fails) and removes dependency on Mockito's default return
    behavior.
    
    Upgraded Mockito from 5.20.0 to 5.23.0 as the issue description allows
    5.21.0 or more recent versions.  Verified locally that both 5.21.0 and
    5.23.0 pass all `ShareCoordinatorServiceTest` tests.
    
    Reviewers: Andrew Schofield <aschofi...@confluent.io>, Sushant Mahajan
     <smaha...@confluent.io>, nileshkumar3 <nileshkum...@gmail.com>
---
 gradle/dependencies.gradle                                        | 2 +-
 .../kafka/coordinator/share/ShareCoordinatorServiceTest.java      | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 05419fd9a54..707328cae23 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -116,7 +116,7 @@ versions += [
   lz4: "1.10.2",
   mavenArtifact: "3.9.11",
   metrics: "2.2.0",
-  mockito: "5.20.0",
+  mockito: "5.23.0",
   opentelemetryProto: "1.3.2-alpha",
   protobuf: "3.25.5", // a dependency of opentelemetryProto
   pcollections: "4.0.2",
diff --git 
a/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/ShareCoordinatorServiceTest.java
 
b/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/ShareCoordinatorServiceTest.java
index 0e52472fb64..6ff5ab4c115 100644
--- 
a/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/ShareCoordinatorServiceTest.java
+++ 
b/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/ShareCoordinatorServiceTest.java
@@ -1510,15 +1510,15 @@ class ShareCoordinatorServiceTest {
             .thenReturn(List.of(tp1, tp2));
 
         when(writer.deleteRecords(
-            any(),
-            eq(10L)
+            eq(tp1),
+            anyLong()
         )).thenReturn(
             CompletableFuture.completedFuture(null)
         );
 
         when(writer.deleteRecords(
-            any(),
-            eq(20L)
+            eq(tp2),
+            anyLong()
         )).thenReturn(
             CompletableFuture.failedFuture(new Exception("bad stuff"))
         );