Commit codestyle to the project and reformat all code by Pazus · Pull Request #76 · utPLSQL/utPLSQL-java-api

Expand Up @@ -28,9 +28,9 @@ public class TestRunner { private static final Logger logger = LoggerFactory.getLogger(TestRunner.class);
private final TestRunnerOptions options = new TestRunnerOptions(); private final List<String> reporterNames = new ArrayList<>(); private CompatibilityProxy compatibilityProxy; private ReporterFactory reporterFactory; private final List<String> reporterNames = new ArrayList<>();
public TestRunner addPath(String path) { options.pathList.add(path); Expand All @@ -47,11 +47,12 @@ public TestRunner addReporter(Reporter reporter) { return this; }
public TestRunner addReporter( String reporterName ) { if ( reporterFactory != null ) public TestRunner addReporter(String reporterName) { if (reporterFactory != null) { options.reporterList.add(reporterFactory.createReporter(reporterName)); else } else { reporterNames.add(reporterName); } return this; }
Expand Down Expand Up @@ -105,22 +106,22 @@ public TestRunner failOnErrors(boolean failOnErrors) { return this; }
public TestRunner skipCompatibilityCheck( boolean skipCompatibilityCheck ) { public TestRunner skipCompatibilityCheck(boolean skipCompatibilityCheck) { options.skipCompatibilityCheck = skipCompatibilityCheck; return this; }
public TestRunner setReporterFactory( ReporterFactory reporterFactory ) { public TestRunner setReporterFactory(ReporterFactory reporterFactory) { this.reporterFactory = reporterFactory; return this; }
private void delayedAddReporters() { if ( reporterFactory != null ) reporterNames.forEach( this::addReporter ); else if (reporterFactory != null) { reporterNames.forEach(this::addReporter); } else { throw new IllegalStateException("ReporterFactory must be set to add delayed Reporters!"); } }
public void run(Connection conn) throws SQLException { Expand All @@ -132,17 +133,19 @@ public void run(Connection conn) throws SQLException { compatibilityProxy = new CompatibilityProxy(conn, options.skipCompatibilityCheck, databaseInformation); logger.info("Running on utPLSQL {}", compatibilityProxy.getDatabaseVersion());
if ( reporterFactory == null ) if (reporterFactory == null) { reporterFactory = ReporterFactory.createDefault(compatibilityProxy); }
delayedAddReporters();
// First of all check version compatibility compatibilityProxy.failOnNotCompatible();
logger.info("Initializing reporters"); for (Reporter r : options.reporterList) for (Reporter r : options.reporterList) { validateReporter(conn, r); }
if (options.pathList.isEmpty()) { options.pathList.add(databaseInformation.getCurrentSchema(conn)); Expand All @@ -153,43 +156,45 @@ public void run(Connection conn) throws SQLException { options.reporterList.add(new DocumentationReporter().init(conn)); }
try(TestRunnerStatement testRunnerStatement = compatibilityProxy.getTestRunnerStatement(options, conn)) { try (TestRunnerStatement testRunnerStatement = compatibilityProxy.getTestRunnerStatement(options, conn)) { logger.info("Running tests"); testRunnerStatement.execute(); logger.info("Running tests finished."); } catch (SQLException e) { if (e.getErrorCode() == SomeTestsFailedException.ERROR_CODE) { throw new SomeTestsFailedException(e.getMessage(), e); } else if (e.getErrorCode() == UtPLSQLNotInstalledException.ERROR_CODE) { } else if (e.getErrorCode() == UtPLSQLNotInstalledException.ERROR_CODE) { throw new UtPLSQLNotInstalledException(e); } else { } else { throw e; } } }
/** * Check if the reporter was initialized, if not call reporter.init. * @param conn the database connection * * @param conn the database connection * @param reporter the reporter * @throws SQLException any sql exception */ private void validateReporter(Connection conn, Reporter reporter) throws SQLException { if (!reporter.isInit() || reporter.getId() == null || reporter.getId().isEmpty()) if (!reporter.isInit() || reporter.getId() == null || reporter.getId().isEmpty()) { reporter.init(conn, compatibilityProxy, reporterFactory); } }
/** Returns the databaseVersion the TestRunner was run against /** * Returns the databaseVersion the TestRunner was run against * * @return Version of the database the TestRunner was run against */ public Version getUsedDatabaseVersion() { if ( compatibilityProxy != null ) if (compatibilityProxy != null) { return compatibilityProxy.getDatabaseVersion(); else } else { return null; } }
}