squah-confluent commented on code in PR #22238:
URL: https://github.com/apache/kafka/pull/22238#discussion_r3214168299
##########
core/src/test/scala/unit/kafka/server/KafkaApisTest.scala:
##########
@@ -1596,17 +1639,22 @@ class KafkaApisTest extends Logging {
assertEquals(expectedTxnOffsetCommitResponse, response.data)
}
- @Test
- def testHandleTxnOffsetCommitRequestTopicsAndPartitionsValidation(): Unit = {
- addTopicToMetadataCache("foo", numPartitions = 2)
- addTopicToMetadataCache("bar", numPartitions = 2)
+ @ParameterizedTest
+ @ApiKeyVersionsSource(apiKey = ApiKeys.TXN_OFFSET_COMMIT)
+ def testHandleTxnOffsetCommitRequestTopicsAndPartitionsValidation(version:
Short): Unit = {
Review Comment:
(not for this PR) The `testHandleOffsetCommitRequest` versions of this
method could use cleanup to match.
##########
core/src/test/scala/unit/kafka/server/KafkaApisTest.scala:
##########
@@ -1502,33 +1502,56 @@ class KafkaApisTest extends Logging {
checkInvalidPartition(1) // topic has only one partition
}
- @Test
- def testHandleTxnOffsetCommitRequest(): Unit = {
- addTopicToMetadataCache("foo", numPartitions = 1)
+ @ParameterizedTest
+ @ApiKeyVersionsSource(apiKey = ApiKeys.TXN_OFFSET_COMMIT)
+ def testHandleTxnOffsetCommitRequest(version: Short): Unit = {
+ val topicName = "foo"
+ val topicId = Uuid.randomUuid()
+ addTopicToMetadataCache(topicName, topicId = topicId, numPartitions = 1)
val txnOffsetCommitRequest = new TxnOffsetCommitRequestData()
.setGroupId("group")
- .setMemberId("member")
- .setGenerationIdOrMemberEpoch(10)
+ .setMemberId(if (version >= 3) "member" else "")
+ .setGenerationIdOrMemberEpoch(if (version >= 3) 10 else -1)
.setProducerId(20)
.setProducerEpoch(30)
- .setGroupInstanceId("instance-id")
+ .setGroupInstanceId(if (version >= 3) "instance-id" else null)
.setTransactionalId("transactional-id")
.setTopics(util.List.of(
new TxnOffsetCommitRequestData.TxnOffsetCommitRequestTopic()
- .setName("foo")
+ .setTopicId(topicId)
+ .setName(topicName)
Review Comment:
In `testHandleOffsetCommitRequest` we set these conditionally too. Do we
want to do the samer here?
Same for `testHandleTxnOffsetCommitRequestFutureFailed` and
`testHandleTxnOffsetCommitRequestTopicsAndPartitionsValidation`.
--
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]
