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 f23394336a7 MINOR: Use Mockito's strict stubs functionality for
Connect tests and cleanup unused stubs (#14166)
f23394336a7 is described below
commit f23394336a7741bf4eb23fcde951af0a23a69bd0
Author: Yash Mayya <[email protected]>
AuthorDate: Wed Aug 9 10:13:28 2023 +0100
MINOR: Use Mockito's strict stubs functionality for Connect tests and
cleanup unused stubs (#14166)
Reviewers: Mickael Maison <[email protected]>
---
.../kafka/connect/runtime/InternalSinkRecordTest.java | 3 +++
.../connect/runtime/TransformationStageTest.java | 3 +++
.../connect/runtime/WorkerConfigTransformerTest.java | 2 +-
.../runtime/distributed/DistributedConfigTest.java | 8 ++++----
.../IncrementalCooperativeAssignorTest.java | 3 +++
.../distributed/WorkerCoordinatorIncrementalTest.java | 3 ++-
.../runtime/distributed/WorkerCoordinatorTest.java | 7 +++++++
.../runtime/distributed/WorkerGroupMemberTest.java | 3 +++
.../runtime/health/ConnectClusterStateImplTest.java | 2 +-
.../runtime/isolation/DelegatingClassLoaderTest.java | 3 +++
.../connect/runtime/rest/ConnectRestServerTest.java | 3 +++
.../runtime/rest/InternalRequestSignatureTest.java | 3 +++
.../kafka/connect/runtime/rest/RestClientTest.java | 5 +++--
.../rest/resources/ConnectorPluginsResourceTest.java | 3 +++
.../runtime/rest/resources/LoggingResourceTest.java | 11 +++--------
.../connect/storage/FileOffsetBackingStoreTest.java | 3 +++
.../storage/KafkaStatusBackingStoreFormatTest.java | 3 +++
.../connect/storage/KafkaStatusBackingStoreTest.java | 4 +++-
.../connect/storage/OffsetStorageWriterTest.java | 3 +++
.../apache/kafka/connect/util/ConnectUtilsTest.java | 3 +++
.../kafka/connect/util/SharedTopicAdminTest.java | 19 ++++++++-----------
21 files changed, 68 insertions(+), 29 deletions(-)
diff --git
a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/InternalSinkRecordTest.java
b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/InternalSinkRecordTest.java
index 173a05f0caa..bc495832020 100644
---
a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/InternalSinkRecordTest.java
+++
b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/InternalSinkRecordTest.java
@@ -20,6 +20,8 @@ import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.apache.kafka.connect.header.Header;
import org.apache.kafka.connect.sink.SinkRecord;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
import java.util.Collections;
@@ -27,6 +29,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
+@RunWith(MockitoJUnitRunner.StrictStubs.class)
public class InternalSinkRecordTest {
private static final String TOPIC = "test-topic";
diff --git
a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/TransformationStageTest.java
b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/TransformationStageTest.java
index d31e8563f8c..6d6b8dcaa81 100644
---
a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/TransformationStageTest.java
+++
b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/TransformationStageTest.java
@@ -20,6 +20,8 @@ import org.apache.kafka.connect.source.SourceRecord;
import org.apache.kafka.connect.transforms.Transformation;
import org.apache.kafka.connect.transforms.predicates.Predicate;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
import static java.util.Collections.singletonMap;
import static org.junit.Assert.assertEquals;
@@ -28,6 +30,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.StrictStubs.class)
public class TransformationStageTest {
private final SourceRecord initial = new
SourceRecord(singletonMap("initial", 1), null, null, null, null);
diff --git
a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/WorkerConfigTransformerTest.java
b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/WorkerConfigTransformerTest.java
index b13f825b961..4af49c0ea16 100644
---
a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/WorkerConfigTransformerTest.java
+++
b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/WorkerConfigTransformerTest.java
@@ -39,7 +39,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(MockitoJUnitRunner.StrictStubs.class)
public class WorkerConfigTransformerTest {
public static final String MY_KEY = "myKey";
diff --git
a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/DistributedConfigTest.java
b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/DistributedConfigTest.java
index 5e529c4b2f7..be5686a222b 100644
---
a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/DistributedConfigTest.java
+++
b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/DistributedConfigTest.java
@@ -21,6 +21,8 @@ import org.apache.kafka.clients.CommonClientConfigs;
import org.apache.kafka.common.config.ConfigException;
import org.apache.kafka.common.security.auth.SecurityProtocol;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
import javax.crypto.KeyGenerator;
import javax.crypto.Mac;
@@ -52,6 +54,7 @@ import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.StrictStubs.class)
public class DistributedConfigTest {
public Map<String, String> configs() {
@@ -93,10 +96,7 @@ public class DistributedConfigTest {
doReturn(fakeKeyGenerator)
.when(crypto).keyGenerator(fakeKeyGenerationAlgorithm);
- // And for the signature algorithm
- doThrow(new NoSuchAlgorithmException())
-
.when(crypto).mac(DistributedConfig.INTER_WORKER_SIGNATURE_ALGORITHM_DEFAULT);
- // Likewise for key verification algorithms
+ // And for the key verification algorithms
for (String verificationAlgorithm :
DistributedConfig.INTER_WORKER_VERIFICATION_ALGORITHMS_DEFAULT) {
doThrow(new NoSuchAlgorithmException())
.when(crypto).mac(verificationAlgorithm);
diff --git
a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/IncrementalCooperativeAssignorTest.java
b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/IncrementalCooperativeAssignorTest.java
index 9ec5368a8bb..a07391e1152 100644
---
a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/IncrementalCooperativeAssignorTest.java
+++
b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/IncrementalCooperativeAssignorTest.java
@@ -28,6 +28,8 @@ import org.apache.kafka.connect.storage.ClusterConfigState;
import org.apache.kafka.connect.util.ConnectorTaskId;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
import java.nio.ByteBuffer;
import java.util.ArrayList;
@@ -55,6 +57,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.StrictStubs.class)
public class IncrementalCooperativeAssignorTest {
// Offset isn't used in most tests but is required for creating a config
snapshot object,
diff --git
a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/WorkerCoordinatorIncrementalTest.java
b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/WorkerCoordinatorIncrementalTest.java
index f8cf14200ca..336bf23ef03 100644
---
a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/WorkerCoordinatorIncrementalTest.java
+++
b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/WorkerCoordinatorIncrementalTest.java
@@ -38,6 +38,7 @@ import org.junit.runners.Parameterized;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
+import org.mockito.quality.Strictness;
import java.nio.ByteBuffer;
import java.util.ArrayList;
@@ -72,7 +73,7 @@ import static org.mockito.Mockito.when;
@RunWith(value = Parameterized.class)
public class WorkerCoordinatorIncrementalTest {
@Rule
- public MockitoRule rule = MockitoJUnit.rule();
+ public MockitoRule rule =
MockitoJUnit.rule().strictness(Strictness.STRICT_STUBS);
private String connectorId1 = "connector1";
private String connectorId2 = "connector2";
diff --git
a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/WorkerCoordinatorTest.java
b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/WorkerCoordinatorTest.java
index 2fa4fa8117b..2c4c61be25f 100644
---
a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/WorkerCoordinatorTest.java
+++
b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/WorkerCoordinatorTest.java
@@ -42,10 +42,14 @@ import
org.apache.kafka.connect.storage.KafkaConfigBackingStore;
import org.apache.kafka.connect.util.ConnectorTaskId;
import org.junit.After;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+import org.mockito.quality.Strictness;
import java.nio.ByteBuffer;
import java.util.ArrayList;
@@ -74,6 +78,9 @@ import static org.mockito.Mockito.when;
@RunWith(value = Parameterized.class)
public class WorkerCoordinatorTest {
+ @Rule
+ public MockitoRule rule =
MockitoJUnit.rule().strictness(Strictness.STRICT_STUBS);
+
private static final String LEADER_URL = "leaderUrl:8083";
private static final String MEMBER_URL = "memberUrl:8083";
diff --git
a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/WorkerGroupMemberTest.java
b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/WorkerGroupMemberTest.java
index 3f44da39f36..ea7ee186f80 100644
---
a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/WorkerGroupMemberTest.java
+++
b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/distributed/WorkerGroupMemberTest.java
@@ -27,7 +27,9 @@ import org.apache.kafka.connect.runtime.MockConnectMetrics;
import org.apache.kafka.connect.runtime.WorkerConfig;
import org.apache.kafka.connect.storage.ConfigBackingStore;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -43,6 +45,7 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
+@RunWith(MockitoJUnitRunner.StrictStubs.class)
public class WorkerGroupMemberTest {
@Mock
private ConfigBackingStore configBackingStore;
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 33af4ad3d22..16c7f428311 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
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertThrows;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doAnswer;
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(MockitoJUnitRunner.StrictStubs.class)
public class ConnectClusterStateImplTest {
protected static final String KAFKA_CLUSTER_ID = "franzwashere";
diff --git
a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/isolation/DelegatingClassLoaderTest.java
b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/isolation/DelegatingClassLoaderTest.java
index a3f2ab142dc..70303e552af 100644
---
a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/isolation/DelegatingClassLoaderTest.java
+++
b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/isolation/DelegatingClassLoaderTest.java
@@ -19,6 +19,8 @@ package org.apache.kafka.connect.runtime.isolation;
import org.apache.kafka.connect.sink.SinkConnector;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
import java.net.MalformedURLException;
import java.net.URL;
@@ -31,6 +33,7 @@ import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.StrictStubs.class)
public class DelegatingClassLoaderTest {
public PluginClassLoader parent;
diff --git
a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/rest/ConnectRestServerTest.java
b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/rest/ConnectRestServerTest.java
index 0e7ad4d26b5..2b78900bc25 100644
---
a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/rest/ConnectRestServerTest.java
+++
b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/rest/ConnectRestServerTest.java
@@ -38,6 +38,8 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
import org.slf4j.LoggerFactory;
import javax.ws.rs.core.MediaType;
@@ -62,6 +64,7 @@ import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
+@RunWith(MockitoJUnitRunner.StrictStubs.class)
public class ConnectRestServerTest {
private Herder herder;
diff --git
a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/rest/InternalRequestSignatureTest.java
b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/rest/InternalRequestSignatureTest.java
index 130c45ee984..82fab131306 100644
---
a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/rest/InternalRequestSignatureTest.java
+++
b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/rest/InternalRequestSignatureTest.java
@@ -22,7 +22,9 @@ import org.apache.kafka.connect.runtime.distributed.Crypto;
import org.apache.kafka.connect.runtime.rest.errors.BadRequestException;
import org.eclipse.jetty.client.api.Request;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
+import org.mockito.junit.MockitoJUnitRunner;
import javax.crypto.Mac;
import javax.crypto.SecretKey;
@@ -43,6 +45,7 @@ import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.StrictStubs.class)
public class InternalRequestSignatureTest {
private static final byte[] REQUEST_BODY =
diff --git
a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/rest/RestClientTest.java
b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/rest/RestClientTest.java
index 5db463c2b04..75ee3b7bd6e 100644
---
a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/rest/RestClientTest.java
+++
b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/rest/RestClientTest.java
@@ -36,6 +36,7 @@ import org.mockito.Mock;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.MockitoRule;
+import org.mockito.quality.Strictness;
import javax.crypto.SecretKey;
import javax.ws.rs.core.Response;
@@ -107,7 +108,7 @@ public class RestClientTest {
public static class RequestFailureParameterizedTest {
@Rule
- public MockitoRule initRule = MockitoJUnit.rule();
+ public MockitoRule initRule =
MockitoJUnit.rule().strictness(Strictness.STRICT_STUBS);
@Mock
private HttpClient httpClient;
@@ -142,7 +143,7 @@ public class RestClientTest {
}
- @RunWith(MockitoJUnitRunner.class)
+ @RunWith(MockitoJUnitRunner.StrictStubs.class)
public static class Tests {
@Mock
private HttpClient httpClient;
diff --git
a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/rest/resources/ConnectorPluginsResourceTest.java
b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/rest/resources/ConnectorPluginsResourceTest.java
index 9e5dc55743a..78d3fe98276 100644
---
a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/rest/resources/ConnectorPluginsResourceTest.java
+++
b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/rest/resources/ConnectorPluginsResourceTest.java
@@ -57,7 +57,9 @@ import
org.apache.kafka.connect.transforms.predicates.RecordIsTombstone;
import org.apache.kafka.connect.util.Callback;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
+import org.mockito.junit.MockitoJUnitRunner;
import javax.ws.rs.BadRequestException;
import java.util.ArrayList;
@@ -89,6 +91,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.StrictStubs.class)
public class ConnectorPluginsResourceTest {
private static final Map<String, String> PROPS;
diff --git
a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/rest/resources/LoggingResourceTest.java
b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/rest/resources/LoggingResourceTest.java
index 63814cdc173..84da433a894 100644
---
a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/rest/resources/LoggingResourceTest.java
+++
b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/rest/resources/LoggingResourceTest.java
@@ -22,6 +22,8 @@ import org.apache.log4j.Hierarchy;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
import java.util.Arrays;
import java.util.Collections;
@@ -38,6 +40,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@SuppressWarnings("unchecked")
+@RunWith(MockitoJUnitRunner.StrictStubs.class)
public class LoggingResourceTest {
@Test
@@ -71,7 +74,6 @@ public class LoggingResourceTest {
Logger b = hierarchy.getLogger("b");
b.setLevel(Level.INFO);
when(loggingResource.currentLoggers()).thenReturn(loggers(a, b));
- when(loggingResource.rootLogger()).thenReturn(root);
when(loggingResource.getLogger(any())).thenCallRealMethod();
Map<String, String> level = (Map<String, String>)
loggingResource.getLogger("a").getEntity();
assertEquals(1, level.size());
@@ -90,7 +92,6 @@ public class LoggingResourceTest {
Logger b = hierarchy.getLogger("b");
b.setLevel(Level.INFO);
when(loggingResource.currentLoggers()).thenReturn(loggers(a, b));
- when(loggingResource.rootLogger()).thenReturn(root);
when(loggingResource.getLogger(any())).thenCallRealMethod();
assertThrows(NotFoundException.class, () ->
loggingResource.getLogger("c"));
}
@@ -113,7 +114,6 @@ public class LoggingResourceTest {
w.setLevel(Level.INFO);
when(loggingResource.currentLoggers()).thenReturn(loggers(x, y, z, w));
when(loggingResource.lookupLogger("a.b.c.p")).thenReturn(p);
- when(loggingResource.rootLogger()).thenReturn(root);
when(loggingResource.setLevel(any(), any())).thenCallRealMethod();
List<String> modified = (List<String>)
loggingResource.setLevel("a.b.c.p", Collections.singletonMap("level",
"DEBUG")).getEntity();
assertEquals(4, modified.size());
@@ -141,7 +141,6 @@ public class LoggingResourceTest {
z.setLevel(Level.INFO);
w.setLevel(Level.INFO);
when(loggingResource.currentLoggers()).thenReturn(loggers(x, y, z, w));
- when(loggingResource.lookupLogger("a.b.c.p")).thenReturn(p);
when(loggingResource.rootLogger()).thenReturn(root);
when(loggingResource.setLevel(any(), any())).thenCallRealMethod();
List<String> modified = (List<String>)
loggingResource.setLevel("root", Collections.singletonMap("level",
"DEBUG")).getEntity();
@@ -166,8 +165,6 @@ public class LoggingResourceTest {
a.setLevel(null);
Logger b = hierarchy.getLogger("b");
b.setLevel(Level.INFO);
- when(loggingResource.currentLoggers()).thenReturn(loggers(a, b));
- when(loggingResource.rootLogger()).thenReturn(root);
when(loggingResource.setLevel(any(), any())).thenCallRealMethod();
assertThrows(BadRequestException.class, () ->
loggingResource.setLevel("@root", Collections.emptyMap()));
}
@@ -183,8 +180,6 @@ public class LoggingResourceTest {
a.setLevel(null);
Logger b = hierarchy.getLogger("b");
b.setLevel(Level.INFO);
- when(loggingResource.currentLoggers()).thenReturn(loggers(a, b));
- when(loggingResource.rootLogger()).thenReturn(root);
when(loggingResource.setLevel(any(), any())).thenCallRealMethod();
assertThrows(NotFoundException.class, () ->
loggingResource.setLevel("@root", Collections.singletonMap("level", "HIGH")));
}
diff --git
a/connect/runtime/src/test/java/org/apache/kafka/connect/storage/FileOffsetBackingStoreTest.java
b/connect/runtime/src/test/java/org/apache/kafka/connect/storage/FileOffsetBackingStoreTest.java
index 9adfa70a1fb..07d48a6e01f 100644
---
a/connect/runtime/src/test/java/org/apache/kafka/connect/storage/FileOffsetBackingStoreTest.java
+++
b/connect/runtime/src/test/java/org/apache/kafka/connect/storage/FileOffsetBackingStoreTest.java
@@ -24,6 +24,8 @@ import org.apache.kafka.connect.util.Callback;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
import java.io.File;
import java.io.IOException;
@@ -49,6 +51,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.StrictStubs.class)
public class FileOffsetBackingStoreTest {
private FileOffsetBackingStore store;
diff --git
a/connect/runtime/src/test/java/org/apache/kafka/connect/storage/KafkaStatusBackingStoreFormatTest.java
b/connect/runtime/src/test/java/org/apache/kafka/connect/storage/KafkaStatusBackingStoreFormatTest.java
index 6d5a4a3c726..a13b76e400f 100644
---
a/connect/runtime/src/test/java/org/apache/kafka/connect/storage/KafkaStatusBackingStoreFormatTest.java
+++
b/connect/runtime/src/test/java/org/apache/kafka/connect/storage/KafkaStatusBackingStoreFormatTest.java
@@ -28,7 +28,9 @@ import org.apache.kafka.connect.util.ConnectorTaskId;
import org.apache.kafka.connect.util.KafkaBasedLog;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
+import org.mockito.junit.MockitoJUnitRunner;
import java.util.Arrays;
import java.util.Collections;
@@ -52,6 +54,7 @@ import static org.mockito.Mockito.timeout;
import static org.mockito.Mockito.verify;
@SuppressWarnings("unchecked")
+@RunWith(MockitoJUnitRunner.StrictStubs.class)
public class KafkaStatusBackingStoreFormatTest {
private static final String STATUS_TOPIC = "status-topic";
diff --git
a/connect/runtime/src/test/java/org/apache/kafka/connect/storage/KafkaStatusBackingStoreTest.java
b/connect/runtime/src/test/java/org/apache/kafka/connect/storage/KafkaStatusBackingStoreTest.java
index 4cad728ae65..11a4b378c96 100644
---
a/connect/runtime/src/test/java/org/apache/kafka/connect/storage/KafkaStatusBackingStoreTest.java
+++
b/connect/runtime/src/test/java/org/apache/kafka/connect/storage/KafkaStatusBackingStoreTest.java
@@ -36,7 +36,9 @@ import org.apache.kafka.connect.util.KafkaBasedLog;
import org.apache.kafka.connect.util.TopicAdmin;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
+import org.mockito.junit.MockitoJUnitRunner;
import java.util.Collections;
import java.util.HashMap;
@@ -62,6 +64,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@SuppressWarnings("unchecked")
+@RunWith(MockitoJUnitRunner.StrictStubs.class)
public class KafkaStatusBackingStoreTest {
private static final String STATUS_TOPIC = "status-topic";
@@ -369,7 +372,6 @@ public class KafkaStatusBackingStoreTest {
statusMap.put("state", "RUNNING");
statusMap.put("generation", 0L);
- when(converter.fromConnectData(eq(STATUS_TOPIC), any(Schema.class),
any(Struct.class))).thenReturn(value);
when(converter.fromConnectData(eq(STATUS_TOPIC), any(Schema.class),
any(Struct.class))).thenReturn(value);
when(converter.toConnectData(STATUS_TOPIC, value)).thenReturn(new
SchemaAndValue(null, statusMap));
diff --git
a/connect/runtime/src/test/java/org/apache/kafka/connect/storage/OffsetStorageWriterTest.java
b/connect/runtime/src/test/java/org/apache/kafka/connect/storage/OffsetStorageWriterTest.java
index 8fa34ac95a3..9929e1926b3 100644
---
a/connect/runtime/src/test/java/org/apache/kafka/connect/storage/OffsetStorageWriterTest.java
+++
b/connect/runtime/src/test/java/org/apache/kafka/connect/storage/OffsetStorageWriterTest.java
@@ -20,7 +20,9 @@ import org.apache.kafka.connect.util.Callback;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
+import org.mockito.junit.MockitoJUnitRunner;
import java.nio.ByteBuffer;
import java.util.Arrays;
@@ -44,6 +46,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;
+@RunWith(MockitoJUnitRunner.StrictStubs.class)
public class OffsetStorageWriterTest {
private static final String NAMESPACE = "namespace";
// Connect format - any types should be accepted here
diff --git
a/connect/runtime/src/test/java/org/apache/kafka/connect/util/ConnectUtilsTest.java
b/connect/runtime/src/test/java/org/apache/kafka/connect/util/ConnectUtilsTest.java
index d34918649a8..0bdfa0d8a91 100644
---
a/connect/runtime/src/test/java/org/apache/kafka/connect/util/ConnectUtilsTest.java
+++
b/connect/runtime/src/test/java/org/apache/kafka/connect/util/ConnectUtilsTest.java
@@ -21,6 +21,8 @@ import org.apache.kafka.connect.runtime.WorkerConfig;
import org.apache.kafka.connect.runtime.distributed.DistributedConfig;
import org.apache.kafka.connect.runtime.standalone.StandaloneConfig;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
import java.util.Collections;
import java.util.HashMap;
@@ -33,6 +35,7 @@ import static org.junit.Assert.assertNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.StrictStubs.class)
public class ConnectUtilsTest {
@Test
diff --git
a/connect/runtime/src/test/java/org/apache/kafka/connect/util/SharedTopicAdminTest.java
b/connect/runtime/src/test/java/org/apache/kafka/connect/util/SharedTopicAdminTest.java
index b0a4e510743..88c59672165 100644
---
a/connect/runtime/src/test/java/org/apache/kafka/connect/util/SharedTopicAdminTest.java
+++
b/connect/runtime/src/test/java/org/apache/kafka/connect/util/SharedTopicAdminTest.java
@@ -16,19 +16,18 @@
*/
package org.apache.kafka.connect.util;
+import org.apache.kafka.connect.errors.ConnectException;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
import java.time.Duration;
import java.util.Collections;
import java.util.Map;
import java.util.function.Function;
-import org.apache.kafka.connect.errors.ConnectException;
-import org.junit.Rule;
-import org.mockito.Mock;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.junit.MockitoJUnit;
-import org.mockito.junit.MockitoRule;
-
import static
org.apache.kafka.connect.util.SharedTopicAdmin.DEFAULT_CLOSE_DURATION;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertThrows;
@@ -38,13 +37,11 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.StrictStubs.class)
public class SharedTopicAdminTest {
private static final Map<String, Object> EMPTY_CONFIG =
Collections.emptyMap();
- @Rule
- public MockitoRule rule = MockitoJUnit.rule();
-
@Mock private TopicAdmin mockTopicAdmin;
@Mock private Function<Map<String, Object>, TopicAdmin> factory;
private SharedTopicAdmin sharedAdmin;
