lucasbru commented on code in PR #14930:
URL: https://github.com/apache/kafka/pull/14930#discussion_r1422828083
##########
clients/src/test/java/org/apache/kafka/clients/consumer/internals/AsyncKafkaConsumerTest.java:
##########
@@ -42,192 +77,142 @@
import
org.apache.kafka.clients.consumer.internals.events.UnsubscribeApplicationEvent;
import
org.apache.kafka.clients.consumer.internals.events.ValidatePositionsApplicationEvent;
import org.apache.kafka.common.KafkaException;
-import org.apache.kafka.common.Node;
import org.apache.kafka.common.TopicPartition;
import org.apache.kafka.common.errors.GroupAuthorizationException;
import org.apache.kafka.common.errors.InvalidGroupIdException;
import org.apache.kafka.common.errors.NetworkException;
import org.apache.kafka.common.errors.RetriableException;
import org.apache.kafka.common.errors.TimeoutException;
import org.apache.kafka.common.errors.WakeupException;
-import org.apache.kafka.common.message.OffsetCommitResponseData;
-import org.apache.kafka.common.protocol.ApiKeys;
import org.apache.kafka.common.protocol.Errors;
-import org.apache.kafka.common.requests.FindCoordinatorResponse;
import org.apache.kafka.common.requests.JoinGroupRequest;
import org.apache.kafka.common.requests.ListOffsetsRequest;
-import org.apache.kafka.common.requests.OffsetCommitResponse;
-import org.apache.kafka.common.requests.RequestHeader;
import org.apache.kafka.common.serialization.StringDeserializer;
+import org.apache.kafka.common.utils.MockTime;
+import org.apache.kafka.common.utils.Time;
import org.apache.kafka.common.utils.Timer;
-import org.apache.kafka.test.TestUtils;
import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.function.Executable;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
import org.mockito.ArgumentCaptor;
import org.mockito.ArgumentMatchers;
-import org.mockito.MockedConstruction;
import org.mockito.Mockito;
-import org.mockito.stubbing.Answer;
-import org.opentest4j.AssertionFailedError;
-
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Properties;
-import java.util.Set;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static java.util.Arrays.asList;
-import static java.util.Collections.singleton;
-import static java.util.Collections.singletonList;
-import static
org.apache.kafka.clients.consumer.internals.ConsumerUtils.THROW_ON_FETCH_STABLE_OFFSET_UNSUPPORTED;
-import static org.apache.kafka.common.utils.Utils.mkEntry;
-import static org.apache.kafka.common.utils.Utils.mkMap;
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.atLeast;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.mockConstruction;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+@SuppressWarnings("unchecked")
public class AsyncKafkaConsumerTest {
- private AsyncKafkaConsumer<?, ?> consumer;
- private FetchCollector<?, ?> fetchCollector;
- private ConsumerTestBuilder.AsyncKafkaConsumerTestBuilder testBuilder;
- private ApplicationEventHandler applicationEventHandler;
- private SubscriptionState subscriptions;
+ private AsyncKafkaConsumer<String, String> consumer = null;
- @BeforeEach
- public void setup() {
- // By default, the consumer is part of a group and autoCommit is
enabled.
- setup(ConsumerTestBuilder.createDefaultGroupInformation(), true);
- }
-
- private void setup(Optional<ConsumerTestBuilder.GroupInformation>
groupInfo, boolean enableAutoCommit) {
- testBuilder = new
ConsumerTestBuilder.AsyncKafkaConsumerTestBuilder(groupInfo, enableAutoCommit,
true);
- applicationEventHandler = testBuilder.applicationEventHandler;
- consumer = testBuilder.consumer;
- fetchCollector = testBuilder.fetchCollector;
- subscriptions = testBuilder.subscriptions;
- }
+ private final Time time = new MockTime(1);
+ private final FetchCollector<String, String> fetchCollector =
mock(FetchCollector.class);
+ private final ApplicationEventHandler applicationEventHandler =
mock(ApplicationEventHandler.class);
+ private final ConsumerMetadata metadata = mock(ConsumerMetadata.class);
+ private final LinkedBlockingQueue<BackgroundEvent> backgroundEventQueue =
new LinkedBlockingQueue<>();
@AfterEach
- public void cleanup() {
- if (testBuilder != null) {
- shutDown();
+ public void resetAll() {
+ backgroundEventQueue.clear();
+ if (consumer != null) {
+ consumer.close();
}
+ consumer = null;
+ Mockito.framework().clearInlineMocks();
}
- private void shutDown() {
- prepAutocommitOnClose();
- testBuilder.close();
+ private AsyncKafkaConsumer<String, String> setup() {
+ final Properties props = requiredConsumerProperties();
+ props.put(ConsumerConfig.GROUP_ID_CONFIG, "group-id");
+ final ConsumerConfig config = new ConsumerConfig(props);
+ return setup(config);
}
- private void resetWithEmptyGroupId() {
- // Create a consumer that is not configured as part of a group.
- cleanup();
- setup(Optional.empty(), false);
+ private AsyncKafkaConsumer<String, String> setupWithoutGroupId() {
+ final Properties props = requiredConsumerProperties();
+ final ConsumerConfig config = new ConsumerConfig(props);
+ return setup(config);
}
- private void resetWithAutoCommitEnabled() {
- cleanup();
- setup(ConsumerTestBuilder.createDefaultGroupInformation(), true);
+ @SuppressWarnings("UnusedReturnValue")
+ private AsyncKafkaConsumer<String, String> setupWithEmptyGroupId() {
+ final Properties props = requiredConsumerPropertiesAndGroupId("");
+ final ConsumerConfig config = new ConsumerConfig(props);
+ return setup(config);
+ }
+
+ private AsyncKafkaConsumer<String, String> setup(ConsumerConfig config) {
Review Comment:
Done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
