lianetm commented on code in PR #16982:
URL: https://github.com/apache/kafka/pull/16982#discussion_r1735186029
##########
clients/src/test/java/org/apache/kafka/clients/consumer/KafkaConsumerTest.java:
##########
@@ -2507,32 +2523,33 @@ public void testCurrentLag(GroupProtocol groupProtocol)
{
assertEquals(OptionalLong.of(45L), consumer.currentLag(tp0));
}
- // TODO: this test triggers a bug with the CONSUMER group protocol
implementation.
- // The bug will be investigated and fixed so this test can use both
group protocols.
@ParameterizedTest
- @EnumSource(value = GroupProtocol.class, names = "CLASSIC")
- public void testListOffsetShouldUpdateSubscriptions(GroupProtocol
groupProtocol) {
+ @EnumSource(GroupProtocol.class)
+ public void testListOffsetShouldUpdateSubscriptions(GroupProtocol
groupProtocol) throws InterruptedException {
final ConsumerMetadata metadata = createMetadata(subscription);
final MockClient client = new MockClient(time, metadata);
initMetadata(client, singletonMap(topic, 1));
- consumer = newConsumer(groupProtocol, time, client, subscription,
metadata, assignor, true, groupInstanceId);
-
+ consumer = newConsumer(groupProtocol, time, client, subscription,
metadata, assignor, false,
+ null, groupInstanceId, false);
consumer.assign(singleton(tp0));
-
- // poll once to update with the current metadata
- consumer.poll(Duration.ofMillis(0));
- client.respond(FindCoordinatorResponse.prepareResponse(Errors.NONE,
groupId, metadata.fetch().nodes().get(0)));
-
consumer.seek(tp0, 50L);
- client.prepareResponse(listOffsetsResponse(singletonMap(tp0, 90L)));
+ client.prepareResponse(listOffsetsResponse(singletonMap(tp0, 90L)));
assertEquals(singletonMap(tp0, 90L),
consumer.endOffsets(Collections.singleton(tp0)));
// correct lag result should be returned as well
assertEquals(OptionalLong.of(40L), consumer.currentLag(tp0));
}
+ private Optional<ClientRequest> findRequest(MockClient client, ApiKeys
apiKey) {
+ return client.requests().stream().filter(request ->
request.requestBuilder().apiKey().equals(apiKey)).findFirst();
+ }
+
+ private boolean requestGenerated(MockClient client, ApiKeys apiKey) {
+ return client.requests().stream().anyMatch(request ->
request.requestBuilder().apiKey().equals(apiKey));
Review Comment:
could we maybe reuse and simplify here to `return findRequest(client,
apiKey).isPresent()`?
##########
clients/src/test/java/org/apache/kafka/clients/consumer/KafkaConsumerTest.java:
##########
@@ -2507,32 +2523,33 @@ public void testCurrentLag(GroupProtocol groupProtocol)
{
assertEquals(OptionalLong.of(45L), consumer.currentLag(tp0));
}
- // TODO: this test triggers a bug with the CONSUMER group protocol
implementation.
- // The bug will be investigated and fixed so this test can use both
group protocols.
@ParameterizedTest
- @EnumSource(value = GroupProtocol.class, names = "CLASSIC")
- public void testListOffsetShouldUpdateSubscriptions(GroupProtocol
groupProtocol) {
+ @EnumSource(GroupProtocol.class)
+ public void testListOffsetShouldUpdateSubscriptions(GroupProtocol
groupProtocol) throws InterruptedException {
Review Comment:
I guess we don't need this throw Interrupted here anymore?
--
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]
