dajac commented on code in PR #17755:
URL: https://github.com/apache/kafka/pull/17755#discussion_r1837581216
##########
group-coordinator/src/test/java/org/apache/kafka/coordinator/group/Assertions.java:
##########
@@ -189,169 +143,188 @@ public static void assertRecordEquals(
}
}
+ private static void assertConsumerGroupHeartbeatResponse(
+ ApiMessage exp,
+ ApiMessage act
+ ) {
+ ConsumerGroupHeartbeatResponseData expected =
(ConsumerGroupHeartbeatResponseData) exp.duplicate();
+ ConsumerGroupHeartbeatResponseData actual =
(ConsumerGroupHeartbeatResponseData) act.duplicate();
+
+ Consumer<ConsumerGroupHeartbeatResponseData> normalize = message -> {
+ if (message.assignment() != null) {
+
message.assignment().topicPartitions().sort(Comparator.comparing(ConsumerGroupHeartbeatResponseData.TopicPartitions::topicId));
+ message.assignment().topicPartitions().forEach(topic ->
topic.partitions().sort(Integer::compareTo));
+ }
+ };
+
+ normalize.accept(expected);
+ normalize.accept(actual);
+
+ assertEquals(expected, actual);
+ }
+
+ private static void assertShareGroupHeartbeatResponse(
+ ApiMessage exp,
+ ApiMessage act
+ ) {
+ ShareGroupHeartbeatResponseData expected =
(ShareGroupHeartbeatResponseData) exp.duplicate();
+ ShareGroupHeartbeatResponseData actual =
(ShareGroupHeartbeatResponseData) act.duplicate();
+
+ Consumer<ShareGroupHeartbeatResponseData> normalize = message -> {
+ if (message.assignment() != null) {
+
message.assignment().topicPartitions().sort(Comparator.comparing(ShareGroupHeartbeatResponseData.TopicPartitions::topicId));
+ message.assignment().topicPartitions().forEach(topic ->
topic.partitions().sort(Integer::compareTo));
+ }
+ };
+
+ normalize.accept(expected);
+ normalize.accept(actual);
+
+ assertEquals(expected, actual);
+ }
+
private static void assertApiMessageAndVersionEquals(
ApiMessageAndVersion expected,
ApiMessageAndVersion actual
) {
if (expected == actual) return;
-
assertEquals(expected.version(), actual.version());
Review Comment:
good point. i added assertNotNull checks for both expected and actual. if
both are nulls, the `if` statement catches it. otherwise, they must be non nul.
##########
group-coordinator/src/test/java/org/apache/kafka/coordinator/group/Assertions.java:
##########
@@ -189,169 +143,188 @@ public static void assertRecordEquals(
}
}
+ private static void assertConsumerGroupHeartbeatResponse(
+ ApiMessage exp,
+ ApiMessage act
+ ) {
+ ConsumerGroupHeartbeatResponseData expected =
(ConsumerGroupHeartbeatResponseData) exp.duplicate();
+ ConsumerGroupHeartbeatResponseData actual =
(ConsumerGroupHeartbeatResponseData) act.duplicate();
+
+ Consumer<ConsumerGroupHeartbeatResponseData> normalize = message -> {
+ if (message.assignment() != null) {
+
message.assignment().topicPartitions().sort(Comparator.comparing(ConsumerGroupHeartbeatResponseData.TopicPartitions::topicId));
+ message.assignment().topicPartitions().forEach(topic ->
topic.partitions().sort(Integer::compareTo));
+ }
+ };
+
+ normalize.accept(expected);
+ normalize.accept(actual);
+
+ assertEquals(expected, actual);
+ }
+
+ private static void assertShareGroupHeartbeatResponse(
+ ApiMessage exp,
+ ApiMessage act
+ ) {
+ ShareGroupHeartbeatResponseData expected =
(ShareGroupHeartbeatResponseData) exp.duplicate();
+ ShareGroupHeartbeatResponseData actual =
(ShareGroupHeartbeatResponseData) act.duplicate();
+
+ Consumer<ShareGroupHeartbeatResponseData> normalize = message -> {
+ if (message.assignment() != null) {
+
message.assignment().topicPartitions().sort(Comparator.comparing(ShareGroupHeartbeatResponseData.TopicPartitions::topicId));
+ message.assignment().topicPartitions().forEach(topic ->
topic.partitions().sort(Integer::compareTo));
+ }
+ };
+
+ normalize.accept(expected);
+ normalize.accept(actual);
+
+ assertEquals(expected, actual);
+ }
+
private static void assertApiMessageAndVersionEquals(
ApiMessageAndVersion expected,
ApiMessageAndVersion actual
) {
if (expected == actual) return;
-
assertEquals(expected.version(), actual.version());
Review Comment:
good point. i added assertNotNull checks for both expected and actual. if
both are nulls, the `if` statement catches it. otherwise, they must be non null.
--
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]
