RunAction tested and functional so far

pesse · pesse · commit d8cbce21e825 · 2019-06-12T14:30:37.000+02:00
diff --git a/src/main/java/org/utplsql/cli/ReporterManager.java b/src/main/java/org/utplsql/cli/ReporterManager.java
@@ -13,6 +13,7 @@
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 
@@ -23,10 +24,16 @@ class ReporterManager {
     private ExecutorService executorService;
 
     ReporterManager(List<String> reporterParams ) {
-        initReporterOptionsList(reporterParams);
+        parseReporterOptionsList(reporterParams);
+        initReporterOptionsList();
     }
 
-    private void initReporterOptionsList( List<String> reporterParams ) {
+    ReporterManager( ReporterOptions[] reporterOptions ) {
+        this.reporterOptionsList = Arrays.asList(reporterOptions);
+        initReporterOptionsList();
+    }
+
+    private void parseReporterOptionsList( List<String> reporterParams ) {
         reporterOptionsList = new ArrayList<>();
         ReporterOptions reporterOptions = null;
 
@@ -44,13 +51,21 @@ private void initReporterOptionsList( List<String> reporterParams ) {
                 reporterOptions.forceOutputToScreen(true);
             }
         }
+    }
+
+    private void initReporterOptionsList( ) {
 
         // If no reporter parameters were passed, use default reporter.
         if (reporterOptionsList.isEmpty()) {
-            reporterOptionsList.add(new ReporterOptions(CoreReporters.UT_DOCUMENTATION_REPORTER.name()));
+            reporterOptionsList = new ArrayList<>();
+            reporterOptionsList.add(getDefaultReporterOption());
         }
     }
 
+    private ReporterOptions getDefaultReporterOption() {
+        return new ReporterOptions(CoreReporters.UT_DOCUMENTATION_REPORTER.name());
+    }
+
     private void abortGathering(Throwable e) {
         addGatherError(e);
         executorService.shutdownNow();
diff --git a/src/main/java/org/utplsql/cli/RunAction.java b/src/main/java/org/utplsql/cli/RunAction.java
@@ -16,6 +16,7 @@
 import org.utplsql.api.reporter.Reporter;
 import org.utplsql.api.reporter.ReporterFactory;
 import org.utplsql.cli.config.FileMapperConfig;
+import org.utplsql.cli.config.ReporterConfig;
 import org.utplsql.cli.config.RunCommandConfig;
 import org.utplsql.cli.exception.DatabaseConnectionFailed;
 import org.utplsql.cli.exception.ReporterTimeoutException;
@@ -54,6 +55,10 @@ void init() {
         LoggerConfiguration.configure(config.getLogConfigLevel());
     }
 
+    public RunCommandConfig getConfig() {
+        return config;
+    }
+
     public int doRun() throws OracleCreateStatmenetStuckException {
         init();
         outputMainInformation();
@@ -270,9 +275,20 @@ private CompatibilityProxy checkFrameworkCompatibility(Connection conn) throws S
     }
 
     private ReporterManager getReporterManager() {
-        ArrayList<String> reporterParams = new ArrayList<>();
-        if ( reporterManager == null )
-            reporterManager = new ReporterManager(reporterParams);
+        if ( reporterManager == null ) {
+
+            ReporterConfig[] reporterConfigs = config.getReporters();
+            if ( reporterConfigs != null ) {
+                ReporterOptions[] options = new ReporterOptions[reporterConfigs.length];
+                for (int i = 0; i<reporterConfigs.length; i++ ) {
+                    options[i] = new ReporterOptions(
+                            reporterConfigs[i].getName(),
+                            reporterConfigs[i].getOutput(),
+                            reporterConfigs[i].isScreen());
+                }
+                reporterManager = new ReporterManager(options);
+            }
+        }
 
         return reporterManager;
     }
diff --git a/src/test/java/org/utplsql/cli/RunActionTest.java b/src/test/java/org/utplsql/cli/RunActionTest.java
@@ -81,7 +81,7 @@ void reporterOptions_TwoReporters() throws Exception {
         assertEquals(CoreReporters.UT_DOCUMENTATION_REPORTER.name(), reporterOptions1.getReporterName());
         assertNull(reporterOptions1.getOutputFileName());
         assertFalse(reporterOptions1.outputToFile());
-        assertTrue(reporterOptions1.outputToScreen());
+        assertFalse(reporterOptions1.outputToScreen());
 
         ReporterOptions reporterOptions2 = reporterOptionsList.get(1);
         assertEquals(CoreReporters.UT_COVERAGE_HTML_REPORTER.name(), reporterOptions2.getReporterName());
@@ -90,13 +90,13 @@ void reporterOptions_TwoReporters() throws Exception {
         assertTrue(reporterOptions2.outputToScreen());
     }
 
-    /*@Test
+    @Test
     void connectionString_asSysdba() throws Exception {
         RunAction runCmd = TestHelper.createRunAction("sys as sysdba/mypass@connectstring/service");
 
         assertEquals("sys as sysdba/mypass@connectstring/service",
-                runCmd.getConnectionInfo().getConnectionString());
-    }*/
+                runCmd.getConfig().getConnectString());
+    }
 
     @Test
     void randomOrder_default() throws Exception {
