[kafka] branch trunk updated: KAFKA-13158: Migrate ConnectClusterStateImpl to Mockito (#12423)

[mi...@apache.org]

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

mimaison 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 6b76c01cf8 KAFKA-13158: Migrate ConnectClusterStateImpl to Mockito (#12423)
6b76c01cf8 is described below

commit 6b76c01cf895db0651e2cdcc07c2c392f00a8ceb
Author: Christo Lolov <lo...@amazon.com>
AuthorDate: Mon Jul 25 18:47:08 2022 +0100

    KAFKA-13158: Migrate ConnectClusterStateImpl to Mockito (#12423)
    
    
    Reviewers: Mickael Maison <mi...@gmail.com>, Chris Egerton <fe...@gmail.com>
---
 build.gradle                                       |  2 +-
 .../health/ConnectClusterStateImplTest.java        | 43 ++++++++++++----------
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/build.gradle b/build.gradle
index 73c36c3117..a85d429a04 100644
--- a/build.gradle
+++ b/build.gradle
@@ -402,7 +402,7 @@ subprojects {
   if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_16)) {
     testsToExclude.addAll([
       // connect tests
-      "**/AbstractHerderTest.*", "**/ConnectClusterStateImplTest.*", "**/ConnectorPluginsResourceTest.*",
+      "**/AbstractHerderTest.*", "**/ConnectorPluginsResourceTest.*",
       "**/ConnectorsResourceTest.*", "**/DistributedHerderTest.*", "**/FileOffsetBakingStoreTest.*",
       "**/ErrorHandlingTaskTest.*", "**/KafkaConfigBackingStoreTest.*", "**/KafkaOffsetBackingStoreTest.*",
       "**/KafkaBasedLogTest.*", "**/OffsetStorageWriterTest.*", "**/StandaloneHerderTest.*",
diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/health/ConnectClusterStateImplTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/health/ConnectClusterStateImplTest.java
index 58eb5a9e97..33af4ad3d2 100644
--- a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/health/ConnectClusterStateImplTest.java
+++ b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/health/ConnectClusterStateImplTest.java
@@ -19,13 +19,12 @@ package org.apache.kafka.connect.runtime.health;
 import org.apache.kafka.connect.errors.ConnectException;
 import org.apache.kafka.connect.runtime.Herder;
 import org.apache.kafka.connect.util.Callback;
-import org.easymock.Capture;
-import org.easymock.EasyMock;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.powermock.api.easymock.annotation.Mock;
-import org.powermock.modules.junit4.PowerMockRunner;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -37,8 +36,10 @@ import java.util.concurrent.TimeoutException;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertThrows;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
 
-@RunWith(PowerMockRunner.class)
+@RunWith(MockitoJUnitRunner.class)
 public class ConnectClusterStateImplTest {
     protected static final String KAFKA_CLUSTER_ID = "franzwashere";
 
@@ -60,13 +61,13 @@ public class ConnectClusterStateImplTest {
     
     @Test
     public void connectors() {
-        Capture<Callback<Collection<String>>> callback = EasyMock.newCapture();
-        herder.connectors(EasyMock.capture(callback));
-        EasyMock.expectLastCall().andAnswer(() -> {
+        @SuppressWarnings("unchecked")
+        ArgumentCaptor<Callback<Collection<String>>> callback = ArgumentCaptor.forClass(Callback.class);
+        doAnswer(invocation -> {
             callback.getValue().onCompletion(null, expectedConnectors);
             return null;
-        });
-        EasyMock.replay(herder);
+        }).when(herder).connectors(callback.capture());
+
         assertEquals(expectedConnectors, connectClusterState.connectors());
     }
 
@@ -74,14 +75,16 @@ public class ConnectClusterStateImplTest {
     public void connectorConfig() {
         final String connName = "sink6";
         final Map<String, String> expectedConfig = Collections.singletonMap("key", "value");
-        Capture<Callback<Map<String, String>>> callback = EasyMock.newCapture();
-        herder.connectorConfig(EasyMock.eq(connName), EasyMock.capture(callback));
-        EasyMock.expectLastCall().andAnswer(() -> {
+
+        @SuppressWarnings("unchecked")
+        ArgumentCaptor<Callback<Map<String, String>>> callback = ArgumentCaptor.forClass(Callback.class);
+        doAnswer(invocation -> {
             callback.getValue().onCompletion(null, expectedConfig);
             return null;
-        });
-        EasyMock.replay(herder);
+        }).when(herder).connectorConfig(eq(connName), callback.capture());
+
         Map<String, String> actualConfig = connectClusterState.connectorConfig(connName);
+
         assertEquals(expectedConfig, actualConfig);
         assertNotSame(
             "Config should be copied in order to avoid mutation by REST extensions",
@@ -97,14 +100,14 @@ public class ConnectClusterStateImplTest {
 
     @Test
     public void connectorsFailure() {
-        Capture<Callback<Collection<String>>> callback = EasyMock.newCapture();
-        herder.connectors(EasyMock.capture(callback));
-        EasyMock.expectLastCall().andAnswer(() -> {
+        @SuppressWarnings("unchecked")
+        ArgumentCaptor<Callback<Collection<String>>> callback = ArgumentCaptor.forClass(Callback.class);
+        doAnswer(invocation -> {
             Throwable timeout = new TimeoutException();
             callback.getValue().onCompletion(timeout, null);
             return null;
-        });
-        EasyMock.replay(herder);
+        }).when(herder).connectors(callback.capture());
+
         assertThrows(ConnectException.class, connectClusterState::connectors);
     }
 }