Skip to content

MINOR: Remove ConsumerTestBuilder.java #16691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chia7712 merged 5 commits into from
Aug 5, 2024
Merged

MINOR: Remove ConsumerTestBuilder.java #16691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
62ab6ca
Removed all traces of ConsumerTestBuilder
brenden20 Jul 25, 2024
4685990
Used ShareConsumerTestBuilder imports
brenden20 Jul 26, 2024
d7c7041
Merge branch 'apache:trunk' into RmCTB
brenden20 Aug 1, 2024
eedabf1
Merge branch 'apache:trunk' into RmCTB
brenden20 Aug 4, 2024
10cca29
Update ShareHeartbeatRequestManagerTest.java
brenden20 Aug 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions checkstyle/suppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,6 @@
<suppress checks="NPathComplexity"
files="MemoryRecordsTest|MetricsTest|RequestResponseTest|TestSslUtils|AclAuthorizerBenchmark"/>

<suppress checks="MethodLength"
files="ConsumerTestBuilder.java"/>

<suppress checks="(WhitespaceAround|LocalVariableName|ImportControl|AvoidStarImport)"
files="Murmur3Test.java"/>

Expand Down
4 changes: 2 additions & 2 deletions ...s/src/test/java/org/apache/kafka/clients/consumer/internals/CommitRequestManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,6 @@
import static org.apache.kafka.clients.consumer.ConsumerConfig.GROUP_ID_CONFIG;
import static org.apache.kafka.clients.consumer.ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG;
import static org.apache.kafka.clients.consumer.ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG;
import static org.apache.kafka.clients.consumer.internals.ConsumerTestBuilder.DEFAULT_GROUP_ID;
import static org.apache.kafka.clients.consumer.internals.ConsumerTestBuilder.DEFAULT_GROUP_INSTANCE_ID;
import static org.apache.kafka.test.TestUtils.assertFutureThrows;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
Expand All @@ -99,6 +97,8 @@ public class CommitRequestManagerTest {
private final long retryBackoffMs = 100;
private final long retryBackoffMaxMs = 1000;
private static final String CONSUMER_COORDINATOR_METRICS = "consumer-coordinator-metrics";
private static final String DEFAULT_GROUP_ID = "group-id";
private static final String DEFAULT_GROUP_INSTANCE_ID = "group-instance-id";
private final Node mockedNode = new Node(1, "host1", 9092);
private SubscriptionState subscriptionState;
private LogContext logContext;
Expand Down
316 changes: 0 additions & 316 deletions clients/src/test/java/org/apache/kafka/clients/consumer/internals/ConsumerTestBuilder.java
View file
Open in desktop

This file was deleted.

14 changes: 7 additions & 7 deletions ...st/java/org/apache/kafka/clients/consumer/internals/ShareHeartbeatRequestManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@
import java.util.Random;
import java.util.concurrent.TimeUnit;

import static org.apache.kafka.clients.consumer.internals.ConsumerTestBuilder.DEFAULT_HEARTBEAT_INTERVAL_MS;
import static org.apache.kafka.clients.consumer.internals.ConsumerTestBuilder.DEFAULT_MAX_POLL_INTERVAL_MS;
import static org.apache.kafka.clients.consumer.internals.ConsumerTestBuilder.DEFAULT_RETRY_BACKOFF_MAX_MS;
import static org.apache.kafka.clients.consumer.internals.ConsumerTestBuilder.DEFAULT_RETRY_BACKOFF_MS;
import static org.apache.kafka.clients.consumer.internals.ConsumerUtils.CONSUMER_SHARE_METRIC_GROUP_PREFIX;
import static org.apache.kafka.clients.consumer.internals.ShareConsumerTestBuilder.DEFAULT_HEARTBEAT_INTERVAL_MS;
import static org.apache.kafka.clients.consumer.internals.ShareConsumerTestBuilder.DEFAULT_MAX_POLL_INTERVAL_MS;
import static org.apache.kafka.clients.consumer.internals.ShareConsumerTestBuilder.DEFAULT_RETRY_BACKOFF_MAX_MS;
import static org.apache.kafka.clients.consumer.internals.ShareConsumerTestBuilder.DEFAULT_RETRY_BACKOFF_MS;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
Expand Down Expand Up @@ -530,7 +530,7 @@ public void testUnknownMemberId(final short version) {
public void testHeartbeatState() {
// The initial ShareGroupHeartbeatRequest sets most fields to their initial empty values
ShareGroupHeartbeatRequestData data = heartbeatState.buildRequestData();
assertEquals(ConsumerTestBuilder.DEFAULT_GROUP_ID, data.groupId());
assertEquals(ShareConsumerTestBuilder.DEFAULT_GROUP_ID, data.groupId());
assertEquals("", data.memberId());
assertEquals(0, data.memberEpoch());
assertEquals(Collections.emptyList(), data.subscribedTopicNames());
Expand All @@ -540,7 +540,7 @@ public void testHeartbeatState() {
// Mock a response from the group coordinator, that supplies the member ID and a new epoch
mockStableMember();
data = heartbeatState.buildRequestData();
assertEquals(ConsumerTestBuilder.DEFAULT_GROUP_ID, data.groupId());
assertEquals(ShareConsumerTestBuilder.DEFAULT_GROUP_ID, data.groupId());
assertEquals(memberId, data.memberId());
assertEquals(1, data.memberEpoch());
assertNull(data.subscribedTopicNames());
Expand All @@ -553,7 +553,7 @@ public void testHeartbeatState() {
membershipManager.onSubscriptionUpdated();
membershipManager.transitionToFenced(); // And indirect way of moving to JOINING state
data = heartbeatState.buildRequestData();
assertEquals(ConsumerTestBuilder.DEFAULT_GROUP_ID, data.groupId());
assertEquals(ShareConsumerTestBuilder.DEFAULT_GROUP_ID, data.groupId());
assertEquals(memberId, data.memberId());
assertEquals(0, data.memberEpoch());
assertEquals(Collections.singletonList(topic), data.subscribedTopicNames());
Expand Down