Skip to content

Commit

Permalink
Fixes #318 - Add run method to CLI (#319)
Browse files Browse the repository at this point in the history
  • Loading branch information
mnriem authored Jul 17, 2024
1 parent 9051899 commit 255915f
Show file tree
Hide file tree
Showing 5 changed files with 112 additions and 88 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
dependency-reduced-pom.xml
nbactions.xml
nbproject/
target/
86 changes: 0 additions & 86 deletions cli/dependency-reduced-pom.xml

This file was deleted.

18 changes: 18 additions & 0 deletions cli/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,24 @@
<version>${picocli.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.10.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>5.10.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.10.2</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down
43 changes: 41 additions & 2 deletions cli/src/main/java/com/manorrock/sphynx/cli/Cli.java
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,53 @@
LogCommand.class
},
versionProvider = CliVersionProvider.class)
public class Cli {
public class Cli implements Runnable {

/**
* Stores the arguments.
*/
private String[] arguments;

/**
* Stores the exit code.
*/
private int exitCode;

/**
* Get the exit code.
*
* @return the exit code.
*/
public int getExitCode() {
return exitCode;
}

/**
* Main entry point.
*
* @param arguments the command-line arguments.
*/
public static void main(String[] arguments) {
System.exit(new CommandLine(new Cli()).execute(arguments));
Cli cli = new Cli();
cli.arguments = arguments;
cli.run();
System.exit(cli.exitCode);
}

/**
* Run the CLI.
*/
@Override
public void run() {
exitCode = new CommandLine(new Cli()).execute(arguments);
}

/**
* Set the arguments.
*
* @param arguments the arguments.
*/
public void setArguments(String[] arguments) {
this.arguments = arguments;
}
}
51 changes: 51 additions & 0 deletions cli/src/test/java/com/manorrock/sphynx/cli/CliTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
/*
* Copyright (c) 2002-2024 Manorrock.com. All Rights Reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the copyright holder nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
package com.manorrock.sphynx.cli;

import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;

/**
* The JUnit test for the Cli class.
*
* @author Manfred Riem ([email protected])
*/
public class CliTest {

/**
* Test run method.
*/
@Test
public void testRun() {
System.out.println("run");
Cli cli = new Cli();
cli.setArguments(new String[] { "--help"});
cli.run();
assertEquals(0, cli.getExitCode());
}
}

0 comments on commit 255915f

Please sign in to comment.