Merge pull request #86 from utPLSQL/bugfix/class_not_found_jaxb

Fixes #82
Fixes #80
Fixes #85

Author: pesse

pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>org.utplsql</groupId>
   <artifactId>cli</artifactId>
-  <version>3.1.0-SNAPSHOT</version>
+  <version>3.1.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>cli</name>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>org.utplsql</groupId>
       <artifactId>java-api</artifactId>
-      <version>3.1.0</version>
+      <version>3.1.1-SNAPSHOT</version>
       <scope>compile</scope>
         <exclusions>
             <exclusion>
@@ -61,6 +61,11 @@
           <version>${junit.jupiter.version}</version>
           <scope>test</scope>
       </dependency>
+      <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>2.3.0</version>
+      </dependency>
   </dependencies>
 
   <build>

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

@@ -27,7 +27,10 @@ public ConnectionInfo(String connectionInfo) {
 
         pds.setJdbcUrl("jdbc:oracle:thin:" + connectionInfo);
         pds.setAutoCommit(false);
+    }
 
+    public void setMaxConnections( int maxConnections ) {
+        pds.setMaximumPoolSize(maxConnections);
     }
 
     public Connection getConnection() throws SQLException {

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

@@ -116,4 +116,6 @@ public void startReporterGatherers(ExecutorService executorService, final Connec
     public List<ReporterOptions> getReporterOptionsList() {
         return reporterOptionsList;
     }
+
+    public int getNumberOfReporters() { return reporterOptionsList.size(); };
 }

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

@@ -113,7 +113,6 @@ public int run() throws Exception {
 
         RunCommandChecker.checkOracleJDBCExists();
 
-        final ConnectionInfo ci = getConnectionInfo();
 
         final List<Reporter> reporterList;
         final List<String> testPaths = getTestPaths();
@@ -145,6 +144,9 @@ public int run() throws Exception {
         final ArrayList<String> finalIncludeObjectsList = includeObjectsList;
         final ArrayList<String> finalExcludeObjectsList = excludeObjectsList;
 
+        final ConnectionInfo ci = getConnectionInfo();
+        ci.setMaxConnections(getReporterManager().getNumberOfReporters()+1);
+
         // Do the reporters initialization, so we can use the id to run and gather results.
         try (Connection conn = ci.getConnection()) {
 

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

@@ -0,0 +1,42 @@
+package org.utplsql.cli;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.util.HashSet;
+import java.util.Set;
+
+public abstract class AbstractFileOutputTest {
+
+    private Set<Path> tempPaths;
+
+    protected void addTempPath(Path path) {
+        tempPaths.add(path);
+    }
+
+    protected boolean tempPathExists( Path path ) { return tempPaths.contains(path); }
+
+    @BeforeEach
+    public void setupTest() {
+        tempPaths = new HashSet<>();
+    }
+
+    @AfterEach
+    public void deleteTempFiles() {
+        tempPaths.forEach(p -> deleteDir(p.toFile()));
+    }
+
+    void deleteDir(File file) {
+        if (file.exists()) {
+            File[] contents = file.listFiles();
+            if (contents != null) {
+                for (File f : contents) {
+                    deleteDir(f);
+                }
+            }
+            file.delete();
+        }
+    }
+}

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

@@ -22,15 +22,10 @@
  *
  * @author pesse
  */
-public class RunCommandCoverageReporterIT {
+public class RunCommandCoverageReporterIT extends AbstractFileOutputTest {
 
     private static final Pattern REGEX_COVERAGE_TITLE = Pattern.compile("<a href=\"[a-zA-Z0-9#]+\" class=\"src_link\" title=\"[a-zA-Z\\._]+\">([a-zA-Z0-9\\._]+)<\\/a>");
 
-    private Set<Path> tempPaths;
-
-    private void addTempPath(Path path) {
-        tempPaths.add(path);
-    }
 
     private String getTempCoverageFileName(int counter) {
 
@@ -47,7 +42,7 @@ private Path getTempCoverageFilePath() {
         int i = 1;
         Path p = Paths.get(getTempCoverageFileName(i));
 
-        while ((Files.exists(p) || tempPaths.contains(p)) && i < 100)
+        while ((Files.exists(p) || tempPathExists(p)) && i < 100)
             p = Paths.get(getTempCoverageFileName(i++));
 
         if (i >= 100)
@@ -77,11 +72,6 @@ private boolean hasCoverageListed(String content, String packageName) {
         return false;
     }
 
-    @BeforeEach
-    public void setupTest() {
-        tempPaths = new HashSet<>();
-    }
-
     @Test
     public void run_CodeCoverageWithIncludeAndExclude() throws Exception {
 
@@ -90,10 +80,9 @@ public void run_CodeCoverageWithIncludeAndExclude() throws Exception {
         RunCommand runCmd = RunCommandTestHelper.createRunCommand(RunCommandTestHelper.getConnectionString(),
                 "-f=ut_coverage_html_reporter", "-o=" + coveragePath, "-s", "-exclude=app.award_bonus,app.betwnstr");
 
-
         int result = runCmd.run();
 
-        String content = new Scanner(coveragePath).useDelimiter("\\Z").next();
+        String content = new String(Files.readAllBytes(coveragePath));
 
         assertEquals(true, hasCoverageListed(content, "app.remove_rooms_by_name"));
         assertEquals(false, hasCoverageListed(content, "app.award_bonus"));
@@ -122,27 +111,11 @@ public void coverageReporterWriteAssetsToOutput() throws Exception {
         assertTrue(applicationJs.exists());
 
         // Check correct script-part in HTML source exists
-        String content = new Scanner(coveragePath).useDelimiter("\\Z").next();
+        String content = new String(Files.readAllBytes(coveragePath));
         assertTrue(content.contains("<script src='" + coverageAssetsPath.toString() + "/application.js' type='text/javascript'>"));
 
         // Check correct title exists
         assertTrue(content.contains("<title>Code coverage</title>"));
     }
 
-    @AfterEach
-    public void deleteTempFiles() {
-        tempPaths.forEach(p -> deleteDir(p.toFile()));
-    }
-
-    void deleteDir(File file) {
-        if (file.exists()) {
-            File[] contents = file.listFiles();
-            if (contents != null) {
-                for (File f : contents) {
-                    deleteDir(f);
-                }
-            }
-            file.delete();
-        }
-    }
 }

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

@@ -2,13 +2,16 @@
 
 import org.junit.jupiter.api.Test;
 import org.utplsql.api.compatibility.OptionalFeatures;
+import org.utplsql.api.reporter.CoreReporters;
+
+import java.nio.file.Paths;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * System tests for run command.
  */
-public class RunCommandIT {
+public class RunCommandIT extends AbstractFileOutputTest {
 
     @Test
     public void run_Default() throws Exception {
@@ -26,6 +29,28 @@ public void run_Default() throws Exception {
         else
             assertEquals(0, result);
     }
+    @Test
+    public void run_MultipleReporters() throws Exception {
+
+        String outputFileName = "output_" + System.currentTimeMillis() + ".xml";
+        addTempPath(Paths.get(outputFileName));
+
+        RunCommand runCmd = RunCommandTestHelper.createRunCommand(RunCommandTestHelper.getConnectionString(),
+                "-f=ut_documentation_reporter",
+                "-s",
+                "-f=" + CoreReporters.UT_SONAR_TEST_REPORTER.name(),
+                "-o=" + outputFileName,
+                "-c",
+                "--failure-exit-code=2");
+
+        int result = runCmd.run();
+
+        // Only expect failure-exit-code to work on several framework versions
+        if (OptionalFeatures.FAIL_ON_ERROR.isAvailableFor(runCmd.getDatabaseVersion()))
+            assertEquals(2, result);
+        else
+            assertEquals(0, result);
+    }
 
 
 }