Convert the RunCommand-properties into the new Config-Objects first

pesse · pesse · commit 0e5b5ebb812d · 2018-07-12T23:48:20.000+02:00
diff --git a/src/main/java/org/utplsql/cli/RunCommand.java b/src/main/java/org/utplsql/cli/RunCommand.java
@@ -10,8 +10,11 @@
 import org.utplsql.api.exception.DatabaseNotCompatibleException;
 import org.utplsql.api.exception.SomeTestsFailedException;
 import org.utplsql.api.exception.UtPLSQLNotInstalledException;
+import org.utplsql.api.reporter.CoreReporters;
 import org.utplsql.api.reporter.Reporter;
 import org.utplsql.api.reporter.ReporterFactory;
+import org.utplsql.cli.config.ReporterConfig;
+import org.utplsql.cli.config.TestRunnerConfig;
 import org.utplsql.cli.exception.DatabaseConnectionFailed;
 
 import javax.sql.DataSource;
@@ -36,10 +39,10 @@ public class RunCommand implements ICommand {
 
     @Parameter(
             required = true,
-            converter = ConnectionInfo.ConnectionStringConverter.class,
+            //converter = ConnectionInfo.ConnectionStringConverter.class,
             arity = 1,
             description = ConnectionInfo.COMMANDLINE_PARAM_DESCRIPTION)
-    private List<ConnectionInfo> connectionInfoList = new ArrayList<>();
+    private String connectionInfo = "";
 
     @Parameter(
             names = {"-p", "--path"},
@@ -100,12 +103,16 @@ public class RunCommand implements ICommand {
     private String excludeObjects = null;
 
 
+    private ConnectionInfo connectionInfoObj;
     private CompatibilityProxy compatibilityProxy;
     private ReporterFactory reporterFactory;
     private ReporterManager reporterManager;
 
     public ConnectionInfo getConnectionInfo() {
-        return connectionInfoList.get(0);
+        if ( connectionInfoObj == null )
+            connectionInfoObj = new ConnectionInfo(connectionInfo);
+
+        return connectionInfoObj;
     }
 
     public List<String> getTestPaths() {
@@ -326,4 +333,81 @@ private ReporterManager getReporterManager() {
     public List<ReporterOptions> getReporterOptionsList() {
         return getReporterManager().getReporterOptionsList();
     }
+
+    private List<ReporterConfig> getReporterConfigs() {
+        List<ReporterConfig> reporterConfigs = new ArrayList<>(5);
+
+        String reporterName = null;
+        String outputFile = null;
+        Boolean forceToScreen = null;
+        for (String p : reporterParams) {
+            if (!p.startsWith("-")) {
+                if ( reporterName != null ) {
+                    reporterConfigs.add(new ReporterConfig(reporterName, outputFile, forceToScreen));
+                    reporterName = null;
+                    outputFile = null;
+                    forceToScreen = null;
+                }
+                reporterName = p;
+            }
+            else if (p.startsWith("-o="))
+                outputFile = p.substring(3);
+            else if (p.equals("-s"))
+                forceToScreen = true;
+        }
+
+        if ( reporterName != null )
+            reporterConfigs.add(new ReporterConfig(reporterName, outputFile, forceToScreen));
+
+        return reporterConfigs;
+    }
+
+    private String[] getSplitList( String delimitedList ) {
+        if ( delimitedList != null && !delimitedList.isEmpty() )
+            return delimitedList.split(",");
+        else
+            return null;
+    }
+
+    public TestRunnerConfig getConfig() {
+        final List<Reporter> reporterList;
+        List<ReporterOptions> reporterOptionsList = new ArrayList<>();
+        ReporterOptions reporterOptions = null;
+
+        List<ReporterConfig> reporterConfigs = getReporterConfigs();
+
+        // If no reporter parameters were passed, use default reporter.
+        if (reporterOptionsList.isEmpty()) {
+            reporterOptionsList.add(new ReporterOptions(CoreReporters.UT_DOCUMENTATION_REPORTER.name()));
+        }
+        final List<String> testPaths = getTestPaths();
+
+        final File baseDir = new File("").getAbsoluteFile();
+        final FileMapperOptions[] sourceMappingOptions = {null};
+        final FileMapperOptions[] testMappingOptions = {null};
+
+        final int[] returnCode = {0};
+
+        sourceMappingOptions[0] = getFileMapperOptionsByParamListItem(this.sourcePathParams, baseDir);
+        testMappingOptions[0] = getFileMapperOptionsByParamListItem(this.testPathParams, baseDir);
+
+        String[] testPathArr = new String[testPaths.size()];
+        testPathArr = testPaths.toArray(testPathArr);
+
+        ReporterConfig[] reporterConfigArr = new ReporterConfig[reporterConfigs.size()];
+        reporterConfigArr = reporterConfigs.toArray(reporterConfigArr);
+
+        return new TestRunnerConfig(
+                connectionInfo,
+                testPathArr,
+                reporterConfigArr,
+                colorConsole,
+                failureExitCode,
+                skipCompatibilityCheck,
+                getSplitList(includeObjects),
+                getSplitList(excludeObjects),
+                null,
+                null
+        );
+    }
 }
diff --git a/src/main/java/org/utplsql/cli/config/ReporterConfig.java b/src/main/java/org/utplsql/cli/config/ReporterConfig.java
@@ -9,10 +9,10 @@ public class ReporterConfig {
     private boolean screen = false;
 
     @ConstructorProperties({"name", "output", "screen"})
-    public ReporterConfig( String name, String output, boolean screen ) {
+    public ReporterConfig( String name, String output, Boolean screen ) {
         this.name = name;
         this.output = output;
-        this.screen = screen;
+        if ( screen != null ) this.screen = screen;
     }
 
     public String getName() {
diff --git a/src/test/java/org/utplsql/cli/YmlConfigTest.java b/src/test/java/org/utplsql/cli/YmlConfigTest.java
@@ -1,5 +1,6 @@
 package org.utplsql.cli;
 
+import com.beust.jcommander.JCommander;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
@@ -10,6 +11,10 @@
 import java.io.File;
 import java.io.IOException;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 public class YmlConfigTest {
 
     @Test
@@ -21,7 +26,38 @@ public void letsPlayAround() throws IOException {
 
         TestRunnerConfig config = mapper.readValue(new File(testConfigFile), TestRunnerConfig.class);
 
-        System.out.println(ReflectionToStringBuilder.toString(config,ToStringStyle.MULTI_LINE_STYLE));
+        System.out.println(ReflectionToStringBuilder.toString(config, ToStringStyle.MULTI_LINE_STYLE));
+    }
+
+    @Test
+    public void configTest() {
+        JCommander jc = new JCommander();
+        jc.setProgramName("utplsql");
+
+        CommandProvider cmdProvider = new CommandProvider();
+
+        cmdProvider.commands().forEach(cmd -> jc.addCommand(cmd.getCommand(), cmd));
+
+        jc.parse("run", TestHelper.getConnectionString(),
+                "-f=ut_coverage_html_reporter", "-o=test.html",
+                "-f=ut_documentation_reporter", "-s",
+                "-exclude=app.award_bonus,app.betwnstr");
+
+        RunCommand cmd = (RunCommand) cmdProvider.getCommand(jc.getParsedCommand());
+
+        TestRunnerConfig config = cmd.getConfig();
+
+        assertEquals(TestHelper.getConnectionString(), config.getConnectString());
+        assertEquals(2, config.getReporters().length);
+        assertEquals("ut_coverage_html_reporter", config.getReporters()[0].getName());
+        assertEquals("test.html", config.getReporters()[0].getOutput());
+        assertEquals(false, config.getReporters()[0].isScreen());
+        assertEquals("ut_documentation_reporter", config.getReporters()[1].getName());
+        assertNull(config.getReporters()[1].getOutput());
+        assertEquals(true, config.getReporters()[1].isScreen());
+        assertEquals("app.award_bonus", config.getExcludePackages()[0]);
+        assertEquals("app.betwnstr", config.getExcludePackages()[1]);
+
     }
 
 
diff --git a/src/test/resources/test b/src/test/resources/test
@@ -0,0 +1,26 @@
+utPLSQL-cli/bin/utplsql run test_runner/pass@db_url \
+ -p=hr,app \
+ -f=ut_documentation_reporter \
+ -f=ut_coverage_html_reporter \
+ -o=coverage.html \
+ -f=ut_sonar_test_reporter \
+ -o=sonar.txt \
+ -s \
+ -c \
+ --failure-exit-code=2 \
+ -scc \
+ -include=app.betwnstr,mypackage \
+ -exclude=mypackage.blugg,stuff \
+ -source_path=sources \
+ -regex_expression="/(\w+)/(\w+)/(\w+)\..{3}$" \
+ -type_mapping="packages_bodies=PACKAGE BODY/types_bodies=TYPE BODY/triggers=TRIGGER/procedures=PROCEDURE/functions=FUNCTION" \
+ -owner_subexpression=2 \
+ -name_subexpression=3 \
+ -type_subexpression=4 \
+ -test_path=tests -regex_expression="/(\w+)/(\w+)/(\w+)\..{3}$" \
+ -type_mapping="body=PACKAGE BODY/type_body=TYPE BODY/trigger=TRIGGER" \
+ -owner_subexpression=2 \
+ -name_subexpression=3 \
+ -type_subexpression=4 \
+ -f=ut_coverage_html_reporter -o=coverage.html \
+ -f=ut_sonar_test_reporter -o=test_results.xml
