Adapt tests to IRunCommand and implement necessary functionality

utPLSQL · pesse · Jun 26, 2019 · Jun 4, 2019 · Jun 7, 2019 · Jun 7, 2019
commit 5e86b01601791c51ac35704ad4340be1365e4bc3
diff --git a/src/main/java/org/utplsql/cli/IRunCommand.java b/src/main/java/org/utplsql/cli/IRunCommand.java
@@ -7,6 +7,8 @@
 
 public interface IRunCommand extends ICommand {
 
+    void initLogger();
+
     TestRunner newTestRunner(List<Reporter> reporterList);
 
     List<ReporterOptions> getReporterOptionsList();

diff --git a/src/main/java/org/utplsql/cli/RunCommand.java b/src/main/java/org/utplsql/cli/RunCommand.java
@@ -147,7 +147,7 @@ ConnectionInfo getConnectionInfo() {
         return connectionInfoList.get(0);
     }
 
-    void init() {
+    public void initLogger() {
 
         LoggerConfiguration.ConfigLevel level = LoggerConfiguration.ConfigLevel.BASIC;
         if ( logSilent ) {
@@ -161,7 +161,7 @@ else if ( logDebug ) {
     }
 
     public int doRun() throws OracleCreateStatmenetStuckException {
-        init();
+        initLogger();
         outputMainInformation();
 
         HikariDataSource dataSource = null;

diff --git a/src/main/java/org/utplsql/cli/RunPicocliCommand.java b/src/main/java/org/utplsql/cli/RunPicocliCommand.java
@@ -1,5 +1,7 @@
 package org.utplsql.cli;
 
+import org.utplsql.api.TestRunner;
+import org.utplsql.api.reporter.Reporter;
 import org.utplsql.cli.config.FileMapperConfig;
 import org.utplsql.cli.config.ReporterConfig;
 import org.utplsql.cli.config.RunCommandConfig;
@@ -11,7 +13,7 @@
 import java.util.*;
 
 @Command( name = "run", description = "run tests")
-public class RunPicocliCommand implements ICommand {
+public class RunPicocliCommand implements IRunCommand {
 
     @Parameters(description = ConnectionInfo.COMMANDLINE_PARAM_DESCRIPTION)
     private String connectionString;
@@ -165,6 +167,8 @@ FileMapperConfig toFileMapperConfig() {
         }
     }
 
+    private RunAction runAction;
+
     private String[] splitOrEmpty(String value) {
         if ( value == null || value.isEmpty() ) {
             return new String[0];
@@ -228,14 +232,35 @@ else if ( logDebug ) {
                 randomTestOrderSeed);
     }
 
+    private RunAction getRunAction() {
+        if ( runAction == null )
+            runAction = new RunAction(getRunCommandConfig());
+
+        return runAction;
+    }
+
     @Override
     public int run() {
-        RunAction action = new RunAction(getRunCommandConfig());
-        return action.run();
+        return getRunAction().run();
     }
 
     @Override
     public String getCommand() {
         return null;
     }
+
+    @Override
+    public TestRunner newTestRunner(List<Reporter> reporterList) {
+        return getRunAction().newTestRunner(reporterList);
+    }
+
+    @Override
+    public List<ReporterOptions> getReporterOptionsList() {
+        return getRunAction().getReporterOptionsList();
+    }
+
+    @Override
+    public void initLogger() {
+        getRunAction().init();
+    }
 }
diff --git a/src/test/java/org/utplsql/cli/PathMapperTest.java b/src/test/java/org/utplsql/cli/PathMapperTest.java
@@ -9,7 +9,7 @@ public class PathMapperTest {
 
     @Test
     void checkPathMapperOutput() {
-        RunCommand runCmd = TestHelper.createRunCommand(TestHelper.getConnectionString(),
+        IRunCommand runCmd = TestHelper.createRunCommand(TestHelper.getConnectionString(),
                 "-f=ut_sonar_test_reporter",
                 "-o=sonar_result.xml",
                 "-s",

diff --git a/src/test/java/org/utplsql/cli/RunCommandArgumentsTest.java b/src/test/java/org/utplsql/cli/RunCommandArgumentsTest.java
@@ -12,7 +12,7 @@ public class RunCommandArgumentsTest {
 
     @Test
     public void allArgumentsAreRecognized() {
-        RunCommand runCmd = TestHelper.createRunCommand(TestHelper.getConnectionString(),
+        IRunCommand runCmd = TestHelper.createRunCommand(TestHelper.getConnectionString(),
                 "-p=app",
                 "-f=ut_sonar_test_reporter",
                     "-o=sonar_result.xml",
@@ -45,7 +45,7 @@ public void allArgumentsAreRecognized() {
 
     @Test
     void multiplePaths() {
-        RunCommand runCmd = TestHelper.createRunCommand(TestHelper.getConnectionString(),
+        IRunCommand runCmd = TestHelper.createRunCommand(TestHelper.getConnectionString(),
                 "-p=app.test_betwnstr,app.test_award_bonus"
         );
 

diff --git a/src/test/java/org/utplsql/cli/RunCommandConfigLevelTest.java b/src/test/java/org/utplsql/cli/RunCommandConfigLevelTest.java
@@ -16,23 +16,23 @@ private Logger getRootLogger() {
     @Test
     void defaultIsInfo() {
         TestHelper.createRunCommand(TestHelper.getConnectionString())
-                .init();
+                .initLogger();
 
         assertEquals(Level.INFO, getRootLogger().getLevel());
     }
 
     @Test
     void silentModeSetsLoggerToOff() {
         TestHelper.createRunCommand(TestHelper.getConnectionString(), "-q")
-                .init();
+                .initLogger();
 
         assertEquals(Level.OFF, getRootLogger().getLevel());
     }
 
     @Test
     void debugModeSetsLoggerToDebug() {
         TestHelper.createRunCommand(TestHelper.getConnectionString(), "-d")
-                .init();
+                .initLogger();
 
         assertEquals(Level.DEBUG, getRootLogger().getLevel());
     }

diff --git a/src/test/java/org/utplsql/cli/RunCommandTest.java b/src/test/java/org/utplsql/cli/RunCommandTest.java
@@ -19,7 +19,7 @@ class RunCommandTest {
 
     @Test
     void reporterOptions_Default() {
-        RunCommand runCmd = TestHelper.createRunCommand(TestHelper.getConnectionString());
+        IRunCommand runCmd = TestHelper.createRunCommand(TestHelper.getConnectionString());
 
         List<ReporterOptions> reporterOptionsList = runCmd.getReporterOptionsList();
 
@@ -32,7 +32,7 @@ void reporterOptions_Default() {
 
     @Test
     void reporterOptions_OneReporter() {
-        RunCommand runCmd = TestHelper.createRunCommand(TestHelper.getConnectionString(), "-f=ut_documentation_reporter", "-o=output.txt");
+        IRunCommand runCmd = TestHelper.createRunCommand(TestHelper.getConnectionString(), "-f=ut_documentation_reporter", "-o=output.txt");
 
         List<ReporterOptions> reporterOptionsList = runCmd.getReporterOptionsList();
 
@@ -45,7 +45,7 @@ void reporterOptions_OneReporter() {
 
     @Test
     void reporterOptions_OneReporterForceScreen() {
-        RunCommand runCmd = TestHelper.createRunCommand(TestHelper.getConnectionString(), "-f=ut_documentation_reporter", "-o=output.txt", "-s");
+        IRunCommand runCmd = TestHelper.createRunCommand(TestHelper.getConnectionString(), "-f=ut_documentation_reporter", "-o=output.txt", "-s");
 
         List<ReporterOptions> reporterOptionsList = runCmd.getReporterOptionsList();
 
@@ -58,7 +58,7 @@ void reporterOptions_OneReporterForceScreen() {
 
     @Test
     void reporterOptions_OneReporterForceScreenInverse() {
-        RunCommand runCmd = TestHelper.createRunCommand(TestHelper.getConnectionString(), "-f=ut_documentation_reporter", "-s", "-o=output.txt");
+        IRunCommand runCmd = TestHelper.createRunCommand(TestHelper.getConnectionString(), "-f=ut_documentation_reporter", "-s", "-o=output.txt");
 
         List<ReporterOptions> reporterOptionsList = runCmd.getReporterOptionsList();
 
@@ -71,7 +71,7 @@ void reporterOptions_OneReporterForceScreenInverse() {
 
     @Test
     void reporterOptions_TwoReporters() {
-        RunCommand runCmd = TestHelper.createRunCommand(TestHelper.getConnectionString(),
+        IRunCommand runCmd = TestHelper.createRunCommand(TestHelper.getConnectionString(),
                 "-f=ut_documentation_reporter",
                 "-f=ut_coverage_html_reporter", "-o=coverage.html", "-s");
 
@@ -90,17 +90,9 @@ void reporterOptions_TwoReporters() {
         assertTrue(reporterOptions2.outputToScreen());
     }
 
-    @Test
-    void connectionString_asSysdba() {
-        RunCommand runCmd = TestHelper.createRunCommand("sys as sysdba/mypass@connectstring/service");
-
-        assertEquals("sys as sysdba/mypass@connectstring/service",
-                runCmd.getConnectionInfo().getConnectionString());
-    }
-
     @Test
     void randomOrder_default() {
-        RunCommand runCmd = TestHelper.createRunCommand(TestHelper.getConnectionString());
+        IRunCommand runCmd = TestHelper.createRunCommand(TestHelper.getConnectionString());
 
         TestRunnerOptions options = runCmd.newTestRunner(new ArrayList<>()).getOptions();
         assertThat(options.randomTestOrder, equalTo(false));
@@ -109,7 +101,7 @@ void randomOrder_default() {
 
     @Test
     void randomOrder_withoutSeed() {
-        RunCommand runCmd = TestHelper.createRunCommand(TestHelper.getConnectionString(),
+        IRunCommand runCmd = TestHelper.createRunCommand(TestHelper.getConnectionString(),
                 "-random");
 
         TestRunnerOptions options = runCmd.newTestRunner(new ArrayList<>()).getOptions();
@@ -119,7 +111,7 @@ void randomOrder_withoutSeed() {
 
     @Test
     void randomOrder_withSeed() {
-        RunCommand runCmd = TestHelper.createRunCommand(TestHelper.getConnectionString(),
+        IRunCommand runCmd = TestHelper.createRunCommand(TestHelper.getConnectionString(),
                 "-seed=42");
 
         TestRunnerOptions options = runCmd.newTestRunner(new ArrayList<>()).getOptions();

diff --git a/src/test/java/org/utplsql/cli/TestHelper.java b/src/test/java/org/utplsql/cli/TestHelper.java
@@ -25,15 +25,29 @@ class TestHelper {
         sPass = EnvironmentVariableUtil.getEnvValue("DB_PASS", "app");
     }
 
+    static RunPicocliCommand createPicocliRunCommand(String... args ) {
+        Object obj = new UtplsqlPicocliCommand();
+        CommandLine cline = new CommandLine(obj);
+        cline.setTrimQuotes(true);
+        List<CommandLine> parsed = cline.parse(args);
+
+        return parsed.get(1).getCommand();
+    }
+
     static IRunCommand createRunCommand(String... args) {
-        RunCommand runCmd = new RunCommand();
+        ArrayList<String> newArgs = new ArrayList<>(args.length+1);
+        newArgs.add("run");
+        newArgs.addAll(Arrays.asList(args));
+        return createPicocliRunCommand(newArgs.toArray(new String[0]));
+
+        /*RunCommand runCmd = new RunCommand();
 
         JCommander.newBuilder()
                 .addObject(runCmd)
                 .args(args)
                 .build();
 
-        return runCmd;
+        return runCmd;*/
     }
 
     static RunCommandConfig parseRunConfig(String... args ) throws Exception {