dajac commented on code in PR #12845:
URL: https://github.com/apache/kafka/pull/12845#discussion_r1021207545
##########
core/src/test/scala/unit/kafka/server/KafkaApisTest.scala:
##########
@@ -2524,196 +2528,166 @@ class KafkaApisTest {
assertEquals(MemoryRecords.EMPTY,
FetchResponse.recordsOrFail(partitionData))
}
- @Test
- def testJoinGroupProtocolsOrder(): Unit = {
- val protocols = List(
- ("first", "first".getBytes()),
- ("second", "second".getBytes())
+ @ParameterizedTest
+ @ApiKeyVersionsSource(apiKey = ApiKeys.JOIN_GROUP)
+ def testHandleJoinGroupRequest(version: Short): Unit = {
+ val joinGroupRequest = new JoinGroupRequestData()
+ .setGroupId("group")
+ .setMemberId("member")
+ .setProtocolType("consumer")
+ .setRebalanceTimeoutMs(1000)
+ .setSessionTimeoutMs(2000)
+
+ val requestChannelRequest = buildRequest(new
JoinGroupRequest.Builder(joinGroupRequest).build(version))
+
+ val expectedRequestContext = new GroupCoordinatorRequestContext(
+ version,
+ requestChannelRequest.context.clientId,
+ requestChannelRequest.context.clientAddress,
+ RequestLocal.NoCaching.bufferSupplier
)
- val groupId = "group"
- val memberId = "member1"
- val protocolType = "consumer"
- val rebalanceTimeoutMs = 10
- val sessionTimeoutMs = 5
- val capturedProtocols: ArgumentCaptor[List[(String, Array[Byte])]] =
ArgumentCaptor.forClass(classOf[List[(String, Array[Byte])]])
+ val expectedJoinGroupRequest = new JoinGroupRequestData()
+ .setGroupId(joinGroupRequest.groupId)
+ .setMemberId(joinGroupRequest.memberId)
+ .setProtocolType(joinGroupRequest.protocolType)
+ .setRebalanceTimeoutMs(if (version >= 1)
joinGroupRequest.rebalanceTimeoutMs else joinGroupRequest.sessionTimeoutMs)
+ .setSessionTimeoutMs(joinGroupRequest.sessionTimeoutMs)
- createKafkaApis().handleJoinGroupRequest(
- buildRequest(
- new JoinGroupRequest.Builder(
- new JoinGroupRequestData()
- .setGroupId(groupId)
- .setMemberId(memberId)
- .setProtocolType(protocolType)
- .setRebalanceTimeoutMs(rebalanceTimeoutMs)
- .setSessionTimeoutMs(sessionTimeoutMs)
- .setProtocols(new
JoinGroupRequestData.JoinGroupRequestProtocolCollection(
- protocols.map { case (name, protocol) => new
JoinGroupRequestProtocol()
- .setName(name).setMetadata(protocol)
- }.iterator.asJava))
- ).build()
- ),
- RequestLocal.withThreadConfinedCaching)
+ val future = new CompletableFuture[JoinGroupResponseData]()
+ when(newGroupCoordinator.joinGroup(
+ ArgumentMatchers.eq(expectedRequestContext),
+ ArgumentMatchers.eq(expectedJoinGroupRequest)
+ )).thenReturn(future)
- verify(groupCoordinator).handleJoinGroup(
- ArgumentMatchers.eq(groupId),
- ArgumentMatchers.eq(memberId),
- ArgumentMatchers.eq(None),
- ArgumentMatchers.eq(true),
- ArgumentMatchers.eq(true),
- ArgumentMatchers.eq(clientId),
- ArgumentMatchers.eq(InetAddress.getLocalHost.toString),
- ArgumentMatchers.eq(rebalanceTimeoutMs),
- ArgumentMatchers.eq(sessionTimeoutMs),
- ArgumentMatchers.eq(protocolType),
- capturedProtocols.capture(),
- any(),
- any(),
- any()
+ createKafkaApis().handleJoinGroupRequest(
+ requestChannelRequest,
+ RequestLocal.NoCaching
)
- val capturedProtocolsList = capturedProtocols.getValue
- assertEquals(protocols.size, capturedProtocolsList.size)
- protocols.zip(capturedProtocolsList).foreach { case ((expectedName,
expectedBytes), (name, bytes)) =>
- assertEquals(expectedName, name)
- assertArrayEquals(expectedBytes, bytes)
- }
- }
- @Test
- def testJoinGroupWhenAnErrorOccurs(): Unit = {
Review Comment:
I have renames this one to `testJoinGroupProtocolTypeBackwardCompatibility`.
--
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: jira-unsubscr...@kafka.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
