Skip to content

KAFKA-19746 : Tools | Fix order of arguments to assertEquals in unit test #20640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: trunk
Choose a base branch
from
+9 −9
Open

KAFKA-19746 : Tools | Fix order of arguments to assertEquals in unit test #20640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
adcac0b
Updated running-app.html file for Available Listeners
samarth-ksolves Aug 27, 2025
77a32cd
Merge branch 'trunk' of github.com:ksolves/kafka into trunk
samarth-ksolves Aug 27, 2025
9e997f3
Merge branch 'apache:trunk' into trunk
abhi-ksolves Aug 27, 2025
9c58cf8
Merge branch 'trunk' of github.com:ksolves/kafka into trunk
samarth-ksolves Sep 23, 2025
82f9363
Fixed order of arguments to assertEquals in tools module
samarth-ksolves Sep 30, 2025
fab52c4
Reverted running-app.html changes
samarth-ksolves Oct 3, 2025
ef12c30
Reverted running-app.html
samarth-ksolves Oct 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions tools/src/test/java/org/apache/kafka/tools/ConfigCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,8 +424,8 @@ public void testParseConfigsToBeAddedForAddConfigFile() throws IOException {
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
Expand Down Expand Up @@ -1177,8 +1177,8 @@ public void shouldNotUpdateConfigIfNonExistingConfigIsDeleted() {
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;
}
};
Expand Down
4 changes: 2 additions & 2 deletions tools/src/test/java/org/apache/kafka/tools/LeaderElectionCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@ public void testDeprecatedAdminConfig() throws Exception {
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));
}
}

Expand Down
2 changes: 1 addition & 1 deletion tools/src/test/java/org/apache/kafka/tools/consumer/group/ResetConsumerGroupOffsetTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -909,7 +909,7 @@ private void resetAndAssertOffsetsCommitted(ClusterInstance cluster,
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));
}));
}
Expand Down
4 changes: 2 additions & 2 deletions tools/src/test/java/org/apache/kafka/tools/streams/StreamsGroupCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,9 +504,9 @@ private static void assertThrow(final String wrongState) {

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) {
Expand Down