Merge pull request #126 from utPLSQL/cleanup

Cleaup of test infrastructure

Author: pesse

pom.xml

@@ -14,8 +14,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <junit.platform.version>1.0.3</junit.platform.version>
-        <junit.jupiter.version>5.0.3</junit.jupiter.version>
+        <junit.jupiter.version>5.4.0</junit.jupiter.version>
         <travisBuildNumber>local</travisBuildNumber>
     </properties>
 
@@ -58,13 +57,7 @@
       <!-- Test -->
       <dependency>
           <groupId>org.junit.jupiter</groupId>
-          <artifactId>junit-jupiter-api</artifactId>
-          <version>${junit.jupiter.version}</version>
-          <scope>test</scope>
-      </dependency>
-      <dependency>
-          <groupId>org.junit.jupiter</groupId>
-          <artifactId>junit-jupiter-engine</artifactId>
+          <artifactId>junit-jupiter</artifactId>
           <version>${junit.jupiter.version}</version>
           <scope>test</scope>
       </dependency>
@@ -94,24 +87,17 @@
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
-            <version>2.19.1</version>
+            <version>2.22.0</version>
             <configuration>
                 <excludes>
                     <exclude>**/*IT.java</exclude>
                 </excludes>
             </configuration>
-            <dependencies>
-                <dependency>
-                    <groupId>org.junit.platform</groupId>
-                    <artifactId>junit-platform-surefire-provider</artifactId>
-                    <version>${junit.platform.version}</version>
-                </dependency>
-            </dependencies>
         </plugin>
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-failsafe-plugin</artifactId>
-            <version>2.19.1</version>
+            <version>2.22.0</version>
             <executions>
                 <execution>
                     <goals>
@@ -120,13 +106,6 @@
                     </goals>
                 </execution>
             </executions>
-            <dependencies>
-                <dependency>
-                    <groupId>org.junit.platform</groupId>
-                    <artifactId>junit-platform-surefire-provider</artifactId>
-                    <version>${junit.platform.version}</version>
-                </dependency>
-            </dependencies>
         </plugin>
     </plugins>
       <resources>

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

@@ -14,16 +14,14 @@
  */
 public class CliVersionInfo {
 
-    private static final String MAVEN_PROJECT_NAME = "utPLSL-cli";
+    private static final String MAVEN_PROJECT_NAME = "utPLSQL-cli";
     private static String MAVEN_PROJECT_VERSION = "unknown";
 
     static {
         try {
-            try ( InputStream in = JavaApiVersionInfo.class.getClassLoader().getResourceAsStream("utplsql-cli.version")) {
-                BufferedReader reader = new BufferedReader(new InputStreamReader(in));
+            try ( InputStream in = JavaApiVersionInfo.class.getClassLoader().getResourceAsStream("utplsql-cli.version");
+                  BufferedReader reader = new BufferedReader(new InputStreamReader(in)) ) {
                 MAVEN_PROJECT_VERSION = reader.readLine();
-
-                reader.close();
             }
         }
         catch ( IOException e ) {

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

@@ -6,19 +6,17 @@
 import java.util.Map;
 import java.util.stream.Stream;
 
-public class CommandProvider {
+class CommandProvider {
 
-    private Map<String, ICommand> commands;
-    private JCommander jCommander;
+    private final Map<String, ICommand> commands = new HashMap<>();
+    private final JCommander jCommander;
 
     public CommandProvider( JCommander jCommander ) {
         this.jCommander = jCommander;
         init();
     }
 
     private void init() {
-        commands = new HashMap<>();
-
         addCommand(new RunCommand());
         addCommand(new VersionInfoCommand());
         addCommand(new ReportersCommand());

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

@@ -5,7 +5,7 @@
 public class ConnectionInfo {
 
     public static final String COMMANDLINE_PARAM_DESCRIPTION = "<user>/<password>@//<host>[:<port>]/<service> OR <user>/<password>@<TNSName> OR <user>/<password>@<host>:<port>:<SID>";
-    private String connectionInfo;
+    private final String connectionInfo;
 
     public ConnectionInfo(String connectionInfo) {
         this.connectionInfo = connectionInfo;

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

@@ -7,11 +7,12 @@
  */
 public class HelpCommand implements ICommand {
 
-    private String errorMessage;
-    private JCommander jCommander;
+    private final String errorMessage;
+    private final JCommander jCommander;
 
     public HelpCommand(JCommander jCommander) {
         this.jCommander = jCommander;
+        this.errorMessage = null;
     }
 
     public HelpCommand( JCommander jCommander, String errorMessage ) {

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

@@ -12,7 +12,7 @@
  *
  * @author pesse
  */
-public class ReporterFactoryProvider {
+class ReporterFactoryProvider {
 
     public static ReporterFactory createReporterFactory(CompatibilityProxy proxy ) {
         ReporterFactory reporterFactory = ReporterFactory.createDefault(proxy);

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

@@ -118,5 +118,5 @@ public List<ReporterOptions> getReporterOptionsList() {
         return reporterOptionsList;
     }
 
-    public int getNumberOfReporters() { return reporterOptionsList.size(); };
+    public int getNumberOfReporters() { return reporterOptionsList.size(); }
 }

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

@@ -121,14 +121,10 @@ public class RunCommand implements ICommand {
     private ReporterFactory reporterFactory;
     private ReporterManager reporterManager;
 
-    public ConnectionInfo getConnectionInfo() {
+    private ConnectionInfo getConnectionInfo() {
         return connectionInfoList.get(0);
     }
 
-    public List<String> getTestPaths() {
-        return testPaths;
-    }
-
     void init() {
 
         LoggerConfiguration.ConfigLevel level = LoggerConfiguration.ConfigLevel.BASIC;
@@ -149,7 +145,6 @@ public int run() {
         try {
 
             final List<Reporter> reporterList;
-            final List<String> testPaths = getTestPaths();
 
             final File baseDir = new File("").getAbsoluteFile();
             final FileMapperOptions[] sourceMappingOptions = {null};
@@ -160,23 +155,8 @@ public int run() {
             sourceMappingOptions[0] = getFileMapperOptionsByParamListItem(this.sourcePathParams, baseDir);
             testMappingOptions[0] = getFileMapperOptionsByParamListItem(this.testPathParams, baseDir);
 
-            ArrayList<String> includeObjectsList;
-            ArrayList<String> excludeObjectsList;
-
-            if (includeObjects != null && !includeObjects.isEmpty()) {
-                includeObjectsList = new ArrayList<>(Arrays.asList(includeObjects.split(",")));
-            } else {
-                includeObjectsList = new ArrayList<>();
-            }
-
-            if (excludeObjects != null && !excludeObjects.isEmpty()) {
-                excludeObjectsList = new ArrayList<>(Arrays.asList(excludeObjects.split(",")));
-            } else {
-                excludeObjectsList = new ArrayList<>();
-            }
-
-            final ArrayList<String> finalIncludeObjectsList = includeObjectsList;
-            final ArrayList<String> finalExcludeObjectsList = excludeObjectsList;
+            final List<String> finalIncludeObjectsList = getObjectList(includeObjects);
+            final List<String> finalExcludeObjectsList = getObjectList(excludeObjects);
 
             final DataSource dataSource = DataSourceProvider.getDataSource(getConnectionInfo(), getReporterManager().getNumberOfReporters() + 1);
 
@@ -236,6 +216,16 @@ public int run() {
         return 1;
     }
 
+    private ArrayList<String> getObjectList(String includeObjects) {
+        ArrayList<String> includeObjectsList;
+        if (includeObjects != null && !includeObjects.isEmpty()) {
+            includeObjectsList = new ArrayList<>(Arrays.asList(includeObjects.split(",")));
+        } else {
+            includeObjectsList = new ArrayList<>();
+        }
+        return includeObjectsList;
+    }
+
     @Override
     public String getCommand() {
         return "run";
@@ -244,7 +234,7 @@ public String getCommand() {
 
     private void outputMainInformation() {
 
-        StringBlockFormatter formatter = new StringBlockFormatter("utPLCSL cli");
+        StringBlockFormatter formatter = new StringBlockFormatter("utPLSQL cli");
         formatter.appendLine(CliVersionInfo.getInfo());
         formatter.appendLine(JavaApiVersionInfo.getInfo());
         formatter.appendLine("Java-Version: " + System.getProperty("java.version"));
@@ -322,7 +312,7 @@ private CompatibilityProxy checkFrameworkCompatibility(Connection conn) throws S
         return proxy;
     }
 
-    public FileMapperOptions getMapperOptions(List<String> mappingParams, List<String> filePaths) {
+    private FileMapperOptions getMapperOptions(List<String> mappingParams, List<String> filePaths) {
         FileMapperOptions mapperOptions = new FileMapperOptions(filePaths);
 
         final String OPT_OWNER="-owner=";
@@ -369,25 +359,14 @@ public FileMapperOptions getMapperOptions(List<String> mappingParams, List<Strin
         return mapperOptions;
     }
 
-    /** Returns the version of the database framework if available
-     *
-     * @return
-     */
-    public Version getDatabaseVersion() {
-        if ( compatibilityProxy != null )
-            return compatibilityProxy.getDatabaseVersion();
-
-        return null;
-    }
-
     private ReporterManager getReporterManager() {
         if ( reporterManager == null )
             reporterManager = new ReporterManager(reporterParams);
 
         return reporterManager;
     }
 
-    public List<ReporterOptions> getReporterOptionsList() {
+    List<ReporterOptions> getReporterOptionsList() {
         return getReporterManager().getReporterOptionsList();
     }
 }

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

@@ -23,7 +23,7 @@ public class VersionInfoCommand implements ICommand {
             description = ConnectionInfo.COMMANDLINE_PARAM_DESCRIPTION)
     private List<ConnectionInfo> connectionInfoList = new ArrayList<>();
 
-    public ConnectionInfo getConnectionInfo() {
+    private ConnectionInfo getConnectionInfo() {
         if ( connectionInfoList != null && connectionInfoList.size() > 0 )
             return connectionInfoList.get(0);
         else