Skip to content

dbeaver/pro#11169 Cover lazy CLI command initialization #136

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

Merged
serge-rider merged 2 commits into from
Oct 20, 2026
Merged

dbeaver/pro#11169 Cover lazy CLI command initialization #136

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d405696
dbeaver/pro#11169 Cover CLI command startup paths
serge-rider Oct 19, 2026
bc7aec8
dbeaver/pro#11169 Verify completion lists contributed commands
serge-rider Oct 19, 2026
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
76 changes: 76 additions & 0 deletions test/org.dbvr.test.platform/src/org/dbvr/test/HelpArgTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,12 @@
*/
package org.dbvr.test;

import org.dbvr.cli.app.CLITopLevelCommand;
import org.dbvr.cli.app.ce.command.TestCommand;
import org.jkiss.code.NotNull;
import org.jkiss.dbeaver.model.cli.CLIConstants;
import org.jkiss.dbeaver.model.cli.CLIProcessResult;
import org.jkiss.dbeaver.model.cli.command.AbstractTopLevelCommand;
import org.jkiss.utils.CommonUtils;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
Expand All @@ -45,6 +48,79 @@ public void testEmptyArgs() throws Exception {
Assertions.assertEquals(resultWithArg.getOutput(), resultNoArg.getOutput());
}

@Test
public void testRootHelpIncludesOtherCommands() throws Exception {
CLIProcessResult result = DBVRTestSuite.getApplication().executeCommandLine(new String[] {"--help"});
String help = result.getOutput().getFirst();

Assertions.assertTrue(help.contains("driver"));
Assertions.assertTrue(help.contains("project"));
Assertions.assertTrue(help.contains("sql"));
}

@Test
public void testRootHelpAliasesMatch() throws Exception {
var app = DBVRTestSuite.getApplication();
var help = app.executeCommandLine(new String[] {AbstractTopLevelCommand.HELP_OPTION}).getOutput();

Assertions.assertEquals(help,
app.executeCommandLine(new String[] {AbstractTopLevelCommand.SHORT_HELP_OPTION}).getOutput());
Assertions.assertEquals(help,
app.executeCommandLine(new String[] {AbstractTopLevelCommand.LEGACY_HELP_OPTION}).getOutput());
}

@Test
public void testRootVersionOptionsMatchFullParser() throws Exception {
var app = DBVRTestSuite.getApplication();
for (String option : new String[] {"-v", "-V", "--version"}) {
CLIProcessResult rootOnly = app.executeCommandLine(new String[] {option});
CLIProcessResult fullParser = app.executeCommandLine(
new String[] {CLITopLevelCommand.OPTION_STATELESS, option});

Assertions.assertEquals(fullParser.getOutput(), rootOnly.getOutput());
Assertions.assertEquals(fullParser.getExitCode(), rootOnly.getExitCode());
Assertions.assertEquals(CLIProcessResult.PostAction.SHUTDOWN, rootOnly.getPostAction());
}
}

@Test
public void testSelectedCommandHelpMatchesOptionFirstInvocation() throws Exception {
var app = DBVRTestSuite.getApplication();
CLIProcessResult selected = app.executeCommandLine(new String[] {"driver", "--help"});
CLIProcessResult optionFirst = app.executeCommandLine(
new String[] {CLITopLevelCommand.OPTION_STATELESS, "driver", "--help"});

Assertions.assertEquals(optionFirst.getOutput(), selected.getOutput());
Assertions.assertEquals(optionFirst.getExitCode(), selected.getExitCode());
}

@Test
public void testCompletionContainsContributedCommands() throws Exception {
CLIProcessResult result = DBVRTestSuite.getApplication().executeCommandLine(new String[] {"completion"});
String script = result.getOutput().getFirst();

Assertions.assertEquals(CLIProcessResult.PostAction.SHUTDOWN, result.getPostAction());
Assertions.assertTrue(script.contains("driver"));
Assertions.assertTrue(script.contains("project"));
Assertions.assertTrue(script.contains("sql"));
Assertions.assertTrue(script.contains(TestCommand.TEST_COMMAND_NAME));
}

@Test
public void testUnknownCommandsStillReportTheirLocation() throws Exception {
var app = DBVRTestSuite.getApplication();
CLIProcessResult unknownRoot = app.executeCommandLine(new String[] {"unknown-command"});
CLIProcessResult unknownOption = app.executeCommandLine(new String[] {"--unknown-option"});
CLIProcessResult unknownSubcommand = app.executeCommandLine(new String[] {"driver", "unknown-subcommand"});

Assertions.assertEquals(CLIConstants.EXIT_CODE_ERROR, unknownRoot.getExitCode());
Assertions.assertTrue(unknownRoot.getOutput().getFirst().contains("after 'dbvr'"));
Assertions.assertEquals(CLIConstants.EXIT_CODE_ERROR, unknownOption.getExitCode());
Assertions.assertTrue(unknownOption.getOutput().getFirst().contains("after 'dbvr'"));
Assertions.assertEquals(CLIConstants.EXIT_CODE_ERROR, unknownSubcommand.getExitCode());
Assertions.assertTrue(unknownSubcommand.getOutput().getFirst().contains("after 'driver'"));
}

@Test
public void testSqlHelpContainsDefaultSchema() throws Exception {
CLIProcessResult result = DBVRTestSuite.getApplication().executeCommandLine(new String[] {"sql", "--help"});
Expand Down
Loading