(kafka) branch trunk updated: MINOR: Fix ShareGroupCommandTest reset-offsets tests passing invalid --from-file scope combination (#22679)

[schofielaj]

This is an automated email from the ASF dual-hosted git repository.

AndrewJSchofield 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 980913a509a MINOR: Fix ShareGroupCommandTest reset-offsets tests 
passing invalid --from-file scope combination (#22679)
980913a509a is described below

commit 980913a509ae2f9fe0c74d0c9c6ad71b53a6266c
Author: Chih-Yuan Chien <joshua2...@gmail.com>
AuthorDate: Fri Jun 26 21:05:34 2026 +0800

    MINOR: Fix ShareGroupCommandTest reset-offsets tests passing invalid 
--from-file scope combination (#22679)
    
    Two tests from #22197 combined `--from-file` with
    `--topic`/`--all-topics`,which `ShareGroupCommandOptions.checkArgs`
    forbids — `allResetOffsetsScopeOpts` makes `{--topic, --all-topics,
    --from-file}` mutually exclusive, enforced via `checkInvalidArgs`. The
    tests only passed because a leaked no-op `Exit` procedure swallowed the
    resulting `printUsageAndExit`.   - Drop `--topic`/`--all-topics` from
    both tests' import args so `--from-file` is the sole scope.   - Adjust
    `describeTopics` count 6 → 5 in `testResetOffsetsExportImportPlan` (no
    `--topic` means partitions come from `listShareGroupOffsets`).
    
    Test-only; no production changes.
    
    Reviewers: Andrew Schofield <aschofi...@confluent.io>
---
 .../apache/kafka/tools/consumer/group/ShareGroupCommandTest.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/tools/src/test/java/org/apache/kafka/tools/consumer/group/ShareGroupCommandTest.java
 
b/tools/src/test/java/org/apache/kafka/tools/consumer/group/ShareGroupCommandTest.java
index 136973ee86f..c3b37bcdc1b 100644
--- 
a/tools/src/test/java/org/apache/kafka/tools/consumer/group/ShareGroupCommandTest.java
+++ 
b/tools/src/test/java/org/apache/kafka/tools/consumer/group/ShareGroupCommandTest.java
@@ -1618,14 +1618,14 @@ public class ShareGroupCommandTest {
             Map<String, Map<TopicPartition, OffsetAndMetadata>> 
offsetsForGroups = service.resetOffsets();
             writeContentToFile(file, 
service.exportOffsetsToCsv(offsetsForGroups));
 
-            String[] cgcArgsExec = new String[]{"--bootstrap-server", 
bootstrapServer, "--reset-offsets", "--from-file", file.getCanonicalPath(), 
"--execute", "--topic", topic, "--group", group};
+            String[] cgcArgsExec = new String[]{"--bootstrap-server", 
bootstrapServer, "--reset-offsets", "--from-file", file.getCanonicalPath(), 
"--execute", "--group", group};
             try (ShareGroupService serviceExec = 
getShareGroupService(cgcArgsExec, adminClient)) {
                 Map<String, Map<TopicPartition, OffsetAndMetadata>> 
offsetsForGroupsExec = serviceExec.resetOffsets();
                 assertEquals(1, offsetsForGroupsExec.size());
                 assertEquals(1, offsetsForGroupsExec.get(group).size());
                 assertEquals(10, offsetsForGroupsExec.get(group).get(new 
TopicPartition(topic, 0)).offset());
                 verify(adminClient).alterShareGroupOffsets(eq(group), 
anyMap(), any(AlterShareGroupOffsetsOptions.class));
-                verify(adminClient, times(6)).describeTopics(anyCollection(), 
any(DescribeTopicsOptions.class));
+                verify(adminClient, times(5)).describeTopics(anyCollection(), 
any(DescribeTopicsOptions.class));
                 verify(alterShareGroupOffsetsResult, times(1)).all();
                 verify(adminClient, 
times(2)).describeShareGroups(ArgumentMatchers.anyCollection(), 
any(DescribeShareGroupsOptions.class));
             }
@@ -1685,7 +1685,7 @@ public class ShareGroupCommandTest {
         
when(adminClient.describeTopics(anyCollection())).thenReturn(describeTopicResult);
         when(adminClient.describeTopics(anyCollection(), 
any(DescribeTopicsOptions.class))).thenReturn(describeTopicResult);
 
-        String[] cgcArgsExec = new String[]{"--bootstrap-server", 
bootstrapServer, "--reset-offsets", "--from-file", file.getCanonicalPath(), 
"--execute", "--all-topics", "--group", group};
+        String[] cgcArgsExec = new String[]{"--bootstrap-server", 
bootstrapServer, "--reset-offsets", "--from-file", file.getCanonicalPath(), 
"--execute", "--group", group};
         try (ShareGroupService serviceExec = getShareGroupService(cgcArgsExec, 
adminClient)) {
             Map<String, Map<TopicPartition, OffsetAndMetadata>> 
offsetsForGroupsExec = serviceExec.resetOffsets();
             assertEquals(1, offsetsForGroupsExec.size());