You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by ce...@apache.org on 2022/07/26 13:39:45 UTC
[kafka] branch trunk updated: KAFKA-13982: Move WorkerConfigTransformerTest to use Mockito (#12422)
This is an automated email from the ASF dual-hosted git repository.
cegerton 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 25b914750d KAFKA-13982: Move WorkerConfigTransformerTest to use Mockito (#12422)
25b914750d is described below
commit 25b914750dcd07ac4c74afbc42956a1affec59e8
Author: Christo Lolov <lo...@amazon.com>
AuthorDate: Tue Jul 26 14:39:27 2022 +0100
KAFKA-13982: Move WorkerConfigTransformerTest to use Mockito (#12422)
---
build.gradle | 2 +-
.../runtime/WorkerConfigTransformerTest.java | 85 ++++++++++++----------
2 files changed, 48 insertions(+), 39 deletions(-)
diff --git a/build.gradle b/build.gradle
index cd76eef0a3..b228428441 100644
--- a/build.gradle
+++ b/build.gradle
@@ -408,7 +408,7 @@ subprojects {
"**/ConnectorsResourceTest.*", "**/DistributedHerderTest.*", "**/FileOffsetBakingStoreTest.*",
"**/ErrorHandlingTaskTest.*", "**/KafkaConfigBackingStoreTest.*", "**/KafkaOffsetBackingStoreTest.*",
"**/KafkaBasedLogTest.*", "**/OffsetStorageWriterTest.*", "**/StandaloneHerderTest.*",
- "**/SourceTaskOffsetCommitterTest.*", "**/WorkerConfigTransformerTest.*", "**/WorkerGroupMemberTest.*",
+ "**/SourceTaskOffsetCommitterTest.*", "**/WorkerGroupMemberTest.*",
"**/WorkerTest.*", "**/WorkerSinkTaskTest.*", "**/WorkerSinkTaskThreadedTest.*",
"**/WorkerSourceTaskTest.*", "**/AbstractWorkerSourceTaskTest.*", "**/ExactlyOnceWorkerSourceTaskTest.*",
"**/WorkerTaskTest.*",
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 6f4bda6690..0184422396 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
@@ -16,17 +16,13 @@
*/
package org.apache.kafka.connect.runtime;
-import org.apache.kafka.common.config.ConfigChangeCallback;
import org.apache.kafka.common.config.ConfigData;
import org.apache.kafka.common.config.provider.ConfigProvider;
-import org.easymock.EasyMock;
-import static org.easymock.EasyMock.eq;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.powermock.api.easymock.PowerMock;
-import org.powermock.api.easymock.annotation.Mock;
-import org.powermock.modules.junit4.PowerMockRunner;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
import java.util.Collections;
import java.util.HashMap;
@@ -35,12 +31,15 @@ import java.util.Set;
import static org.apache.kafka.connect.runtime.ConnectorConfig.CONFIG_RELOAD_ACTION_CONFIG;
import static org.apache.kafka.connect.runtime.ConnectorConfig.CONFIG_RELOAD_ACTION_NONE;
-import static org.easymock.EasyMock.notNull;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
-import static org.powermock.api.easymock.PowerMock.replayAll;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.notNull;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
-@RunWith(PowerMockRunner.class)
+@RunWith(MockitoJUnitRunner.class)
public class WorkerConfigTransformerTest {
public static final String MY_KEY = "myKey";
@@ -53,64 +52,78 @@ public class WorkerConfigTransformerTest {
public static final String TEST_RESULT_WITH_TTL = "testResultWithTTL";
public static final String TEST_RESULT_WITH_LONGER_TTL = "testResultWithLongerTTL";
- @Mock private Herder herder;
- @Mock private Worker worker;
- @Mock private HerderRequest requestId;
+ @Mock
+ private Herder herder;
+ @Mock
+ private Worker worker;
+ @Mock
+ private HerderRequest requestId;
private WorkerConfigTransformer configTransformer;
@Before
public void setup() {
- worker = PowerMock.createMock(Worker.class);
- herder = PowerMock.createMock(Herder.class);
configTransformer = new WorkerConfigTransformer(worker, Collections.singletonMap("test", new TestConfigProvider()));
}
@Test
public void testReplaceVariable() {
+ // Execution
Map<String, String> result = configTransformer.transform(MY_CONNECTOR, Collections.singletonMap(MY_KEY, "${test:testPath:testKey}"));
+
+ // Assertions
assertEquals(TEST_RESULT, result.get(MY_KEY));
}
@Test
public void testReplaceVariableWithTTL() {
- EasyMock.expect(worker.herder()).andReturn(herder);
-
- replayAll();
+ // Setup
+ when(worker.herder()).thenReturn(herder);
+ // Execution
Map<String, String> props = new HashMap<>();
props.put(MY_KEY, "${test:testPath:testKeyWithTTL}");
props.put(CONFIG_RELOAD_ACTION_CONFIG, CONFIG_RELOAD_ACTION_NONE);
Map<String, String> result = configTransformer.transform(MY_CONNECTOR, props);
+
+ // Assertions
+ assertEquals(TEST_RESULT_WITH_TTL, result.get(MY_KEY));
}
@Test
public void testReplaceVariableWithTTLAndScheduleRestart() {
- EasyMock.expect(worker.herder()).andReturn(herder);
- EasyMock.expect(herder.restartConnector(eq(1L), eq(MY_CONNECTOR), notNull())).andReturn(requestId);
- replayAll();
+ // Setup
+ when(worker.herder()).thenReturn(herder);
+ when(herder.restartConnector(eq(1L), eq(MY_CONNECTOR), notNull())).thenReturn(requestId);
+ // Execution
Map<String, String> result = configTransformer.transform(MY_CONNECTOR, Collections.singletonMap(MY_KEY, "${test:testPath:testKeyWithTTL}"));
+
+ // Assertions
assertEquals(TEST_RESULT_WITH_TTL, result.get(MY_KEY));
+ verify(herder).restartConnector(eq(1L), eq(MY_CONNECTOR), notNull());
}
@Test
public void testReplaceVariableWithTTLFirstCancelThenScheduleRestart() {
- EasyMock.expect(worker.herder()).andReturn(herder);
- EasyMock.expect(herder.restartConnector(eq(1L), eq(MY_CONNECTOR), notNull())).andReturn(requestId);
-
- EasyMock.expect(worker.herder()).andReturn(herder);
- EasyMock.expectLastCall();
- requestId.cancel();
- EasyMock.expectLastCall();
- EasyMock.expect(herder.restartConnector(eq(10L), eq(MY_CONNECTOR), notNull())).andReturn(requestId);
-
- replayAll();
+ // Setup
+ when(worker.herder()).thenReturn(herder);
+ when(herder.restartConnector(eq(1L), eq(MY_CONNECTOR), notNull())).thenReturn(requestId);
+ when(herder.restartConnector(eq(10L), eq(MY_CONNECTOR), notNull())).thenReturn(requestId);
+ // Execution
Map<String, String> result = configTransformer.transform(MY_CONNECTOR, Collections.singletonMap(MY_KEY, "${test:testPath:testKeyWithTTL}"));
+
+ // Assertions
assertEquals(TEST_RESULT_WITH_TTL, result.get(MY_KEY));
+ verify(herder).restartConnector(eq(1L), eq(MY_CONNECTOR), notNull());
+ // Execution
result = configTransformer.transform(MY_CONNECTOR, Collections.singletonMap(MY_KEY, "${test:testPath:testKeyWithLongerTTL}"));
+
+ // Assertions
assertEquals(TEST_RESULT_WITH_LONGER_TTL, result.get(MY_KEY));
+ verify(requestId, times(1)).cancel();
+ verify(herder).restartConnector(eq(10L), eq(MY_CONNECTOR), notNull());
}
@Test
@@ -120,13 +133,16 @@ public class WorkerConfigTransformerTest {
public static class TestConfigProvider implements ConfigProvider {
+ @Override
public void configure(Map<String, ?> configs) {
}
+ @Override
public ConfigData get(String path) {
return null;
}
+ @Override
public ConfigData get(String path, Set<String> keys) {
if (path.equals(TEST_PATH)) {
if (keys.contains(TEST_KEY)) {
@@ -140,14 +156,7 @@ public class WorkerConfigTransformerTest {
return new ConfigData(Collections.emptyMap());
}
- public void subscribe(String path, Set<String> keys, ConfigChangeCallback callback) {
- throw new UnsupportedOperationException();
- }
-
- public void unsubscribe(String path, Set<String> keys) {
- throw new UnsupportedOperationException();
- }
-
+ @Override
public void close() {
}
}