Include RunAction into RunCommand

Author: pesse

src/main/java/org/utplsql/cli/RunPicocliCommand.java

@@ -3,13 +3,15 @@
 import org.utplsql.cli.config.FileMapperConfig;
 import org.utplsql.cli.config.ReporterConfig;
 import org.utplsql.cli.config.RunCommandConfig;
-import picocli.CommandLine.*;
+import picocli.CommandLine.ArgGroup;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.Option;
+import picocli.CommandLine.Parameters;
 
 import java.util.*;
-import java.util.concurrent.Callable;
 
 @Command( name = "run", description = "run tests")
-public class RunPicocliCommand implements Callable<RunCommandConfig> {
+public class RunPicocliCommand implements ICommand {
 
     @Parameters(description = ConnectionInfo.COMMANDLINE_PARAM_DESCRIPTION)
     private String connectionString;
@@ -172,9 +174,7 @@ private String[] splitOrEmpty(String value) {
         }
     }
 
-    @Override
-    public RunCommandConfig call() throws Exception {
-
+    public RunCommandConfig getRunCommandConfig() {
         // Prepare path elements
         ArrayList<String> suitePaths = new ArrayList<>();
         for ( String pathElem : paths ) {
@@ -227,4 +227,15 @@ else if ( logDebug ) {
                 randomTestOrder,
                 randomTestOrderSeed);
     }
+
+    @Override
+    public int run() {
+        RunAction action = new RunAction(getRunCommandConfig());
+        return action.run();
+    }
+
+    @Override
+    public String getCommand() {
+        return null;
+    }
 }

src/test/java/org/utplsql/cli/PicocliRunCommandTest.java

@@ -21,7 +21,7 @@ private RunCommandConfig parseForConfig( String... args ) throws Exception {
         List<CommandLine> parsed = cline.parse(args);
 
         RunPicocliCommand runCmd = parsed.get(1).getCommand();
-        return runCmd.call();
+        return runCmd.getRunCommandConfig();
     }
 
     @Test

src/test/java/org/utplsql/cli/TestHelper.java

@@ -43,7 +43,7 @@ static RunCommandConfig parseRunConfig(String... args ) throws Exception {
         List<CommandLine> parsed = cline.parse(args);
 
         RunPicocliCommand runCmd = parsed.get(1).getCommand();
-        return runCmd.call();
+        return runCmd.getRunCommandConfig();
     }
 
     static RunAction createRunAction(String... args) throws Exception {