tests imports optimized

refactored ReportInspectors: moved Map creation to interface default method, moved info storage and initialization to subclasses from abstract class.
Fixed test failure due to wrong order of construction

Author: Pazus

Diff for: src/main/java/org/utplsql/api/reporter/inspect/AbstractReporterInspector.java

@@ -3,33 +3,15 @@
 import org.utplsql.api.reporter.ReporterFactory;
 
 import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 
 abstract class AbstractReporterInspector implements ReporterInspector  {
 
     protected final ReporterFactory reporterFactory;
     protected final Connection connection;
-    protected final Set<ReporterInfo> infos;
 
-    AbstractReporterInspector(ReporterFactory reporterFactory, Connection conn ) throws SQLException {
+    AbstractReporterInspector(ReporterFactory reporterFactory, Connection conn ) {
         this.reporterFactory = reporterFactory;
         this.connection = conn;
-        this.infos = loadReporterInfos();
-    }
-
-    protected abstract Set<ReporterInfo> loadReporterInfos() throws SQLException;
-
-    @Override
-    public Map<String, ReporterInfo> getReporterInfoMap() {
-        return infos.stream().collect(Collectors.toMap(ReporterInfo::getName, Function.identity()));
-    }
-
-    @Override
-    public List<ReporterInfo> getReporterInfos() {
-        return new ArrayList<>(infos);
     }
 
 }

Diff for: src/main/java/org/utplsql/api/reporter/inspect/ReporterInspector.java

@@ -9,6 +9,8 @@
 import java.sql.SQLException;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * Gives information about available reporters
@@ -19,7 +21,9 @@ public interface ReporterInspector {
 
     List<ReporterInfo> getReporterInfos();
 
-    Map<String, ReporterInfo> getReporterInfoMap();
+    default Map<String, ReporterInfo> getReporterInfoMap() {
+        return getReporterInfos().stream().collect(Collectors.toMap(ReporterInfo::getName, Function.identity()));
+    }
 
     /**
      * Returns a new instance of a ReporterInspector, based on the utPLSQL version used in the connection

Diff for: src/main/java/org/utplsql/api/reporter/inspect/ReporterInspector310.java

@@ -20,27 +20,29 @@
 class ReporterInspector310 extends AbstractReporterInspector {
 
     private final Map<String, String> registeredReporterFactoryMethods;
+    private final Set<ReporterInfo> infos;
 
     ReporterInspector310(ReporterFactory reporterFactory, Connection conn ) throws SQLException {
         super(reporterFactory, conn);
-
         registeredReporterFactoryMethods = reporterFactory.getRegisteredReporterInfo();
 
-    }
-
-    @Override
-    protected Set<ReporterInfo> loadReporterInfos() throws SQLException {
         Set<ReporterInfo> reporterInfos = new HashSet<>();
         try (PreparedStatement stmt = connection.prepareStatement("select * from table(ut_runner.get_reporters_list) order by 1")) {
             try (ResultSet rs = stmt.executeQuery() ) {
                 while (rs.next())
                     reporterInfos.add(getReporterInfo(rs.getString(1)));
             }
         }
-        return reporterInfos;
+        this.infos = reporterInfos;
+
+    }
+
+    @Override
+    public List<ReporterInfo> getReporterInfos() {
+        return new ArrayList<>(infos);
     }
 
-    private ReporterInfo getReporterInfo( String reporterNameWithOwner ) throws SQLException {
+    private ReporterInfo getReporterInfo(String reporterNameWithOwner ) throws SQLException {
         String reporterName = reporterNameWithOwner.substring(reporterNameWithOwner.indexOf(".")+1).toUpperCase();
 
         ReporterInfo.Type type = ReporterInfo.Type.SQL;

Diff for: src/main/java/org/utplsql/api/reporter/inspect/ReporterInspectorPre310.java

@@ -7,21 +7,25 @@
 
 import java.sql.Connection;
 import java.sql.SQLException;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 class ReporterInspectorPre310 extends AbstractReporterInspector {
 
     private final Map<String, String> registeredReporterFactoryMethods;
     private final Map<CoreReporters, String> descriptions = new HashMap<>();
+    private final Set<ReporterInfo> infos;
 
     ReporterInspectorPre310(ReporterFactory reporterFactory, Connection conn) throws SQLException {
         super(reporterFactory, conn);
-        initDefaultDescriptions();
         registeredReporterFactoryMethods = reporterFactory.getRegisteredReporterInfo();
+        initDefaultDescriptions();
+
+        Version databaseVersion = new CompatibilityProxy(connection).getDatabaseVersion();
+        this.infos = Arrays.stream(CoreReporters.values())
+                .filter(r -> r.isAvailableFor(databaseVersion))
+                .map(this::getReporterInfo)
+                .collect(Collectors.toSet());
     }
 
     private void initDefaultDescriptions() {
@@ -35,12 +39,8 @@ private void initDefaultDescriptions() {
     }
 
     @Override
-    protected Set<ReporterInfo> loadReporterInfos() throws SQLException {
-        Version databaseVersion = new CompatibilityProxy(connection).getDatabaseVersion();
-        return Arrays.stream(CoreReporters.values())
-                .filter(r -> r.isAvailableFor(databaseVersion))
-                .map(this::getReporterInfo)
-                .collect(Collectors.toSet());
+    public List<ReporterInfo> getReporterInfos() {
+        return new ArrayList<>(this.infos);
     }
 
     private ReporterInfo getReporterInfo(CoreReporters reporter) {

Diff for: src/test/java/org/utplsql/api/RegisterCustomReporterTest.java

@@ -1,7 +1,6 @@
 package org.utplsql.api;
 
 import org.junit.jupiter.api.Test;
-import org.utplsql.api.compatibility.CompatibilityProxy;
 import org.utplsql.api.reporter.DefaultReporter;
 import org.utplsql.api.reporter.Reporter;
 import org.utplsql.api.reporter.ReporterFactory;

Diff for: src/test/java/org/utplsql/api/ReporterInspectorIT.java

@@ -1,25 +1,18 @@
 package org.utplsql.api;
 
-import oracle.jdbc.OracleCallableStatement;
-import oracle.jdbc.OracleConnection;
-import oracle.jdbc.OracleType;
 import org.junit.jupiter.api.Test;
 import org.utplsql.api.compatibility.CompatibilityProxy;
 import org.utplsql.api.exception.InvalidVersionException;
 import org.utplsql.api.reporter.CoreReporters;
-import org.utplsql.api.reporter.Reporter;
 import org.utplsql.api.reporter.ReporterFactory;
 import org.utplsql.api.reporter.inspect.ReporterInfo;
 import org.utplsql.api.reporter.inspect.ReporterInspector;
 
-import java.sql.PreparedStatement;
 import java.sql.SQLException;
-import java.sql.SQLType;
 import java.util.Comparator;
 import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class ReporterInspectorIT extends AbstractDatabaseTest {
 

Diff for: src/test/java/org/utplsql/api/TestRunnerIT.java

@@ -5,7 +5,7 @@
 import org.utplsql.api.compatibility.CompatibilityProxy;
 import org.utplsql.api.exception.InvalidVersionException;
 import org.utplsql.api.exception.SomeTestsFailedException;
-import org.utplsql.api.reporter.*;
+import org.utplsql.api.reporter.CoreReporters;
 
 import java.sql.Connection;
 import java.sql.SQLException;

Diff for: src/test/java/org/utplsql/api/VersionObjectTest.java

@@ -3,9 +3,7 @@
 import org.junit.jupiter.api.Test;
 import org.utplsql.api.exception.InvalidVersionException;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class VersionObjectTest {
 

Diff for: src/test/java/org/utplsql/api/reporter/CoverageHTMLReporterAssetTest.java

@@ -3,13 +3,13 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.*;
 import java.nio.file.attribute.BasicFileAttributes;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 public class CoverageHTMLReporterAssetTest {
 
     private static final String TEST_FOLDER = "__testAssets";

Diff for: src/test/java/org/utplsql/api/testRunner/TestRunnerStatementProviderIT.java

@@ -8,7 +8,6 @@
 import java.sql.SQLException;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
 
 public class TestRunnerStatementProviderIT extends AbstractDatabaseTest {