[kafka] branch 3.3 updated: KAFKA-14974: Restore backward compatibility in KafkaBasedLog - fix unit tests

[rhauch]

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

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


The following commit(s) were added to refs/heads/3.3 by this push:
     new 811fcac9f10 KAFKA-14974: Restore backward compatibility in 
KafkaBasedLog - fix unit tests
811fcac9f10 is described below

commit 811fcac9f1044540fe7dfeb07b762fc1638723b7
Author: Randall Hauch <rha...@gmail.com>
AuthorDate: Tue May 9 12:44:12 2023 -0500

    KAFKA-14974: Restore backward compatibility in KafkaBasedLog - fix unit 
tests
    
    Fix the unit tests that broke when cherry-picking the change to the 3.3 
branch.
---
 .../connect/storage/KafkaOffsetBackingStoreTest.java | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git 
a/connect/runtime/src/test/java/org/apache/kafka/connect/storage/KafkaOffsetBackingStoreTest.java
 
b/connect/runtime/src/test/java/org/apache/kafka/connect/storage/KafkaOffsetBackingStoreTest.java
index 701351cb676..cf11230f3d2 100644
--- 
a/connect/runtime/src/test/java/org/apache/kafka/connect/storage/KafkaOffsetBackingStoreTest.java
+++ 
b/connect/runtime/src/test/java/org/apache/kafka/connect/storage/KafkaOffsetBackingStoreTest.java
@@ -193,9 +193,11 @@ public class KafkaOffsetBackingStoreTest {
 
         // Set offsets
         Capture<org.apache.kafka.clients.producer.Callback> callback0 = 
EasyMock.newCapture();
-        
EasyMock.expect(storeLog.sendWithReceipt(EasyMock.aryEq(TP0_KEY.array()), 
EasyMock.aryEq(TP0_VALUE.array()), 
EasyMock.capture(callback0))).andReturn(null);
+        storeLog.send(EasyMock.aryEq(TP0_KEY.array()), 
EasyMock.aryEq(TP0_VALUE.array()), EasyMock.capture(callback0));
+        PowerMock.expectLastCall();
         Capture<org.apache.kafka.clients.producer.Callback> callback1 = 
EasyMock.newCapture();
-        
EasyMock.expect(storeLog.sendWithReceipt(EasyMock.aryEq(TP1_KEY.array()), 
EasyMock.aryEq(TP1_VALUE.array()), 
EasyMock.capture(callback1))).andReturn(null);
+        storeLog.send(EasyMock.aryEq(TP1_KEY.array()), 
EasyMock.aryEq(TP1_VALUE.array()), EasyMock.capture(callback1));
+        PowerMock.expectLastCall();
 
         // Second get() should get the produced data and return the new values
         final Capture<Callback<Void>> secondGetReadToEndCallback = 
EasyMock.newCapture();
@@ -274,9 +276,10 @@ public class KafkaOffsetBackingStoreTest {
 
         // Set offsets
         Capture<org.apache.kafka.clients.producer.Callback> callback0 = 
EasyMock.newCapture();
-        
EasyMock.expect(storeLog.sendWithReceipt(EasyMock.isNull(byte[].class), 
EasyMock.aryEq(TP0_VALUE.array()), 
EasyMock.capture(callback0))).andReturn(null);
+        storeLog.send(EasyMock.isNull(byte[].class), 
EasyMock.aryEq(TP0_VALUE.array()), EasyMock.capture(callback0));
+        PowerMock.expectLastCall();
         Capture<org.apache.kafka.clients.producer.Callback> callback1 = 
EasyMock.newCapture();
-        
EasyMock.expect(storeLog.sendWithReceipt(EasyMock.aryEq(TP1_KEY.array()), 
EasyMock.isNull(byte[].class), EasyMock.capture(callback1))).andReturn(null);
+        storeLog.send(EasyMock.aryEq(TP1_KEY.array()), 
EasyMock.isNull(byte[].class), EasyMock.capture(callback1));
         PowerMock.expectLastCall();
 
         // Second get() should get the produced data and return the new values
@@ -334,11 +337,14 @@ public class KafkaOffsetBackingStoreTest {
 
         // Set offsets
         Capture<org.apache.kafka.clients.producer.Callback> callback0 = 
EasyMock.newCapture();
-        
EasyMock.expect(storeLog.sendWithReceipt(EasyMock.aryEq(TP0_KEY.array()), 
EasyMock.aryEq(TP0_VALUE.array()), 
EasyMock.capture(callback0))).andReturn(null);
+        storeLog.send(EasyMock.aryEq(TP0_KEY.array()), 
EasyMock.aryEq(TP0_VALUE.array()), EasyMock.capture(callback0));
+        PowerMock.expectLastCall();
         Capture<org.apache.kafka.clients.producer.Callback> callback1 = 
EasyMock.newCapture();
-        
EasyMock.expect(storeLog.sendWithReceipt(EasyMock.aryEq(TP1_KEY.array()), 
EasyMock.aryEq(TP1_VALUE.array()), 
EasyMock.capture(callback1))).andReturn(null);
+        storeLog.send(EasyMock.aryEq(TP1_KEY.array()), 
EasyMock.aryEq(TP1_VALUE.array()), EasyMock.capture(callback1));
+        PowerMock.expectLastCall();
         Capture<org.apache.kafka.clients.producer.Callback> callback2 = 
EasyMock.newCapture();
-        
EasyMock.expect(storeLog.sendWithReceipt(EasyMock.aryEq(TP2_KEY.array()), 
EasyMock.aryEq(TP2_VALUE.array()), 
EasyMock.capture(callback2))).andReturn(null);
+        storeLog.send(EasyMock.aryEq(TP2_KEY.array()), 
EasyMock.aryEq(TP2_VALUE.array()), EasyMock.capture(callback2));
+        PowerMock.expectLastCall();
 
         expectClusterId();