Skip to content

Commit 05999c7

Browse files
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]>
1 parent 25aae99 commit 05999c7

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

tools/src/test/java/org/apache/kafka/tools/ConfigCommandTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -424,8 +424,8 @@ public void testParseConfigsToBeAddedForAddConfigFile() throws IOException {
424424
public void testExpectedEntityTypeNames(List<String> expectedTypes, List<String> expectedNames, List<String> connectOpts, String... args) {
425425
ConfigCommand.ConfigCommandOptions createOpts = new ConfigCommand.ConfigCommandOptions(toArray(List.of(connectOpts.get(0), connectOpts.get(1), "--describe"), List.of(args)));
426426
createOpts.checkArgs();
427-
assertEquals(createOpts.entityTypes().toSeq(), seq(expectedTypes));
428-
assertEquals(createOpts.entityNames().toSeq(), seq(expectedNames));
427+
assertEquals(seq(expectedTypes), createOpts.entityTypes().toSeq());
428+
assertEquals(seq(expectedNames), createOpts.entityNames().toSeq());
429429
}
430430

431431
@Test
@@ -1177,8 +1177,8 @@ public void shouldNotUpdateConfigIfNonExistingConfigIsDeleted() {
11771177
public synchronized DescribeConfigsResult describeConfigs(Collection<ConfigResource> resources, DescribeConfigsOptions options) {
11781178
assertEquals(1, resources.size());
11791179
ConfigResource res = resources.iterator().next();
1180-
assertEquals(res.type(), ConfigResource.Type.TOPIC);
1181-
assertEquals(res.name(), resourceName);
1180+
assertEquals(ConfigResource.Type.TOPIC, res.type());
1181+
assertEquals(resourceName, res.name());
11821182
return describeResult;
11831183
}
11841184
};

tools/src/test/java/org/apache/kafka/tools/LeaderElectionCommandTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ public void testDeprecatedAdminConfig() throws Exception {
124124
mockedAdmin.verify(() -> Admin.create(argumentCaptor.capture()));
125125
// verify that properties provided to admin client are the overridden properties
126126
final Properties actualProps = argumentCaptor.getValue();
127-
assertEquals(actualProps.get(AdminClientConfig.REQUEST_TIMEOUT_MS_CONFIG), requestTimeoutMs);
128-
assertEquals(actualProps.get(AdminClientConfig.DEFAULT_API_TIMEOUT_MS_CONFIG), defaultApiTimeoutMs);
127+
assertEquals(requestTimeoutMs, actualProps.get(AdminClientConfig.REQUEST_TIMEOUT_MS_CONFIG));
128+
assertEquals(defaultApiTimeoutMs, actualProps.get(AdminClientConfig.DEFAULT_API_TIMEOUT_MS_CONFIG));
129129
}
130130
}
131131

tools/src/test/java/org/apache/kafka/tools/consumer/group/ResetConsumerGroupOffsetTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -909,7 +909,7 @@ private void resetAndAssertOffsetsCommitted(ClusterInstance cluster,
909909
Map<String, Map<TopicPartition, OffsetAndMetadata>> allResetOffsets = resetOffsets(service);
910910

911911
allResetOffsets.forEach((group, offsetsInfo) -> offsetsInfo.forEach((tp, offsetMetadata) -> {
912-
assertEquals(offsetMetadata.offset(), expectedOffsets.get(tp));
912+
assertEquals(expectedOffsets.get(tp), offsetMetadata.offset());
913913
assertEquals(expectedOffsets, committedOffsets(cluster, topic, group));
914914
}));
915915
}

tools/src/test/java/org/apache/kafka/tools/streams/StreamsGroupCommandTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -542,9 +542,9 @@ private static void assertThrow(final String wrongState) {
542542

543543
final String[] exceptionMessage = exception.getMessage().split(" Valid states are: ");
544544
assertEquals("Invalid state list '" + wrongState + "'.", exceptionMessage[0]);
545-
assertEquals(Arrays.stream(exceptionMessage[1].split(","))
545+
assertEquals(validStates, Arrays.stream(exceptionMessage[1].split(","))
546546
.map(String::trim)
547-
.collect(Collectors.toSet()), validStates);
547+
.collect(Collectors.toSet()));
548548
}
549549

550550
private DescribeStreamsGroupsResult describeStreamsResult(String groupId, GroupState groupState) {

0 commit comments

Comments
 (0)