This is an automated email from the ASF dual-hosted git repository.
schofielaj pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new 05999c70c14 KAFKA-19746 : Tools | Fix order of arguments to
assertEquals in unit test (#20640)
05999c70c14 is described below
commit 05999c70c14ed998e4c0bc19ade1518bdc3df748
Author: samarth-ksolves <[email protected]>
AuthorDate: Tue Oct 21 20:49:52 2025 +0530
KAFKA-19746 : Tools | Fix order of arguments to assertEquals in unit test
(#20640)
In this PR, we corrected the argument order in assertEquals within the
tools package.
Reviewers: Ken Huang <[email protected]>, Andrew Schofield
<[email protected]>
---------
Co-authored-by: Abhi Tiwari
<[email protected]>
---
tools/src/test/java/org/apache/kafka/tools/ConfigCommandTest.java | 8 ++++----
.../java/org/apache/kafka/tools/LeaderElectionCommandTest.java | 4 ++--
.../kafka/tools/consumer/group/ResetConsumerGroupOffsetTest.java | 2 +-
.../org/apache/kafka/tools/streams/StreamsGroupCommandTest.java | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/tools/src/test/java/org/apache/kafka/tools/ConfigCommandTest.java
b/tools/src/test/java/org/apache/kafka/tools/ConfigCommandTest.java
index 0aecba43463..13cfb281111 100644
--- a/tools/src/test/java/org/apache/kafka/tools/ConfigCommandTest.java
+++ b/tools/src/test/java/org/apache/kafka/tools/ConfigCommandTest.java
@@ -424,8 +424,8 @@ public class ConfigCommandTest {
public void testExpectedEntityTypeNames(List<String> expectedTypes,
List<String> expectedNames, List<String> connectOpts, String... args) {
ConfigCommand.ConfigCommandOptions createOpts = new
ConfigCommand.ConfigCommandOptions(toArray(List.of(connectOpts.get(0),
connectOpts.get(1), "--describe"), List.of(args)));
createOpts.checkArgs();
- assertEquals(createOpts.entityTypes().toSeq(), seq(expectedTypes));
- assertEquals(createOpts.entityNames().toSeq(), seq(expectedNames));
+ assertEquals(seq(expectedTypes), createOpts.entityTypes().toSeq());
+ assertEquals(seq(expectedNames), createOpts.entityNames().toSeq());
}
@Test
@@ -1177,8 +1177,8 @@ public class ConfigCommandTest {
public synchronized DescribeConfigsResult
describeConfigs(Collection<ConfigResource> resources, DescribeConfigsOptions
options) {
assertEquals(1, resources.size());
ConfigResource res = resources.iterator().next();
- assertEquals(res.type(), ConfigResource.Type.TOPIC);
- assertEquals(res.name(), resourceName);
+ assertEquals(ConfigResource.Type.TOPIC, res.type());
+ assertEquals(resourceName, res.name());
return describeResult;
}
};
diff --git
a/tools/src/test/java/org/apache/kafka/tools/LeaderElectionCommandTest.java
b/tools/src/test/java/org/apache/kafka/tools/LeaderElectionCommandTest.java
index 2e3ebf6a7bd..8809e3ca174 100644
--- a/tools/src/test/java/org/apache/kafka/tools/LeaderElectionCommandTest.java
+++ b/tools/src/test/java/org/apache/kafka/tools/LeaderElectionCommandTest.java
@@ -124,8 +124,8 @@ public class LeaderElectionCommandTest {
mockedAdmin.verify(() -> Admin.create(argumentCaptor.capture()));
// verify that properties provided to admin client are the
overridden properties
final Properties actualProps = argumentCaptor.getValue();
-
assertEquals(actualProps.get(AdminClientConfig.REQUEST_TIMEOUT_MS_CONFIG),
requestTimeoutMs);
-
assertEquals(actualProps.get(AdminClientConfig.DEFAULT_API_TIMEOUT_MS_CONFIG),
defaultApiTimeoutMs);
+ assertEquals(requestTimeoutMs,
actualProps.get(AdminClientConfig.REQUEST_TIMEOUT_MS_CONFIG));
+ assertEquals(defaultApiTimeoutMs,
actualProps.get(AdminClientConfig.DEFAULT_API_TIMEOUT_MS_CONFIG));
}
}
diff --git
a/tools/src/test/java/org/apache/kafka/tools/consumer/group/ResetConsumerGroupOffsetTest.java
b/tools/src/test/java/org/apache/kafka/tools/consumer/group/ResetConsumerGroupOffsetTest.java
index bbcfb6e35c1..503a5bea217 100644
---
a/tools/src/test/java/org/apache/kafka/tools/consumer/group/ResetConsumerGroupOffsetTest.java
+++
b/tools/src/test/java/org/apache/kafka/tools/consumer/group/ResetConsumerGroupOffsetTest.java
@@ -909,7 +909,7 @@ public class ResetConsumerGroupOffsetTest {
Map<String, Map<TopicPartition, OffsetAndMetadata>> allResetOffsets =
resetOffsets(service);
allResetOffsets.forEach((group, offsetsInfo) ->
offsetsInfo.forEach((tp, offsetMetadata) -> {
- assertEquals(offsetMetadata.offset(), expectedOffsets.get(tp));
+ assertEquals(expectedOffsets.get(tp), offsetMetadata.offset());
assertEquals(expectedOffsets, committedOffsets(cluster, topic,
group));
}));
}
diff --git
a/tools/src/test/java/org/apache/kafka/tools/streams/StreamsGroupCommandTest.java
b/tools/src/test/java/org/apache/kafka/tools/streams/StreamsGroupCommandTest.java
index cd1b66d993f..ecfddf725f3 100644
---
a/tools/src/test/java/org/apache/kafka/tools/streams/StreamsGroupCommandTest.java
+++
b/tools/src/test/java/org/apache/kafka/tools/streams/StreamsGroupCommandTest.java
@@ -542,9 +542,9 @@ public class StreamsGroupCommandTest {
final String[] exceptionMessage = exception.getMessage().split(" Valid
states are: ");
assertEquals("Invalid state list '" + wrongState + "'.",
exceptionMessage[0]);
- assertEquals(Arrays.stream(exceptionMessage[1].split(","))
+ assertEquals(validStates, Arrays.stream(exceptionMessage[1].split(","))
.map(String::trim)
- .collect(Collectors.toSet()), validStates);
+ .collect(Collectors.toSet()));
}
private DescribeStreamsGroupsResult describeStreamsResult(String groupId,
GroupState groupState) {
