From 2c7d2e380d02d0f7dc77944ca5775ddaa3540457 Mon Sep 17 00:00:00 2001 From: bachmanity1 Date: Tue, 8 Aug 2023 20:39:15 +0900 Subject: [PATCH] mock admin when needed only --- .../org/apache/kafka/connect/util/KafkaBasedLogTest.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/util/KafkaBasedLogTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/util/KafkaBasedLogTest.java index 206b3cad3bba..c5e793cfbfd9 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/util/KafkaBasedLogTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/util/KafkaBasedLogTest.java @@ -70,6 +70,7 @@ import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyLong; import static org.mockito.Mockito.eq; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -115,12 +116,11 @@ public class KafkaBasedLogTest { private final Time time = new MockTime(); private MockedKafkaBasedLog store; - @Mock - private TopicAdmin admin = null; @Mock private Consumer initializer; @Mock private KafkaProducer producer; + private TopicAdmin admin; private final Supplier topicAdminSupplier = () -> admin; private MockConsumer consumer; @@ -445,6 +445,7 @@ public void testReadEndOffsetsUsingAdmin() { Map endOffsets = new HashMap<>(); endOffsets.put(TP0, 0L); endOffsets.put(TP1, 0L); + admin = mock(TopicAdmin.class); when(admin.retryEndOffsets(eq(tps), any(), anyLong())).thenReturn(endOffsets); when(admin.endOffsets(eq(tps))).thenReturn(endOffsets); @@ -455,6 +456,7 @@ public void testReadEndOffsetsUsingAdmin() { @Test public void testReadEndOffsetsUsingAdminThatFailsWithUnsupported() { Set tps = new HashSet<>(Arrays.asList(TP0, TP1)); + admin = mock(TopicAdmin.class); // Getting end offsets using the admin client should fail with unsupported version when(admin.retryEndOffsets(eq(tps), any(), anyLong())).thenThrow(new UnsupportedVersionException("too old")); @@ -474,6 +476,7 @@ public void testReadEndOffsetsUsingAdminThatFailsWithRetriable() { Map endOffsets = new HashMap<>(); endOffsets.put(TP0, 0L); endOffsets.put(TP1, 0L); + admin = mock(TopicAdmin.class); // Getting end offsets upon startup should work fine when(admin.retryEndOffsets(eq(tps), any(), anyLong())).thenReturn(endOffsets); // Getting end offsets using the admin client should fail with leader not available