Skip to content

Commit 078b727

Browse files
committed
Add useful information in RunCommand
1 parent 9014771 commit 078b727

File tree

1 file changed

+24
-11
lines changed

1 file changed

+24
-11
lines changed

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

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@
66
import org.slf4j.LoggerFactory;
77
import org.utplsql.api.*;
88
import org.utplsql.api.compatibility.CompatibilityProxy;
9+
import org.utplsql.api.db.DefaultDatabaseInformation;
910
import org.utplsql.api.exception.DatabaseNotCompatibleException;
1011
import org.utplsql.api.exception.SomeTestsFailedException;
1112
import org.utplsql.api.exception.UtPLSQLNotInstalledException;
1213
import org.utplsql.api.reporter.Reporter;
1314
import org.utplsql.api.reporter.ReporterFactory;
1415
import org.utplsql.cli.exception.DatabaseConnectionFailed;
16+
import org.utplsql.cli.log.StringBlockFormatter;
1517

1618
import javax.sql.DataSource;
1719
import java.io.File;
@@ -117,17 +119,7 @@ public int run() {
117119

118120
LoggerConfiguration.configureDefault();
119121

120-
logger.info("##################### utPLSQL cli ####################");
121-
logger.info("#");
122-
logger.info("# {} ", CliVersionInfo.getInfo());
123-
logger.info("# {} ", JavaApiVersionInfo.getInfo());
124-
logger.info("# Java-Version: {} ", System.getProperty("java.version"));
125-
logger.info("# ORACLE_HOME: {} ", EnvironmentVariableUtil.getEnvValue("ORACLE_HOME"));
126-
logger.info("# ");
127-
logger.info("# Thank you for testing! ");
128-
logger.info("#");
129-
logger.info("######################################################");
130-
logger.info("");
122+
outputMainInformation();
131123

132124
try {
133125

@@ -173,6 +165,7 @@ public int run() {
173165
compatibilityProxy = checkFrameworkCompatibility(conn);
174166

175167
logger.info("Successfully connected to database. UtPLSQL core: " + compatibilityProxy.getDatabaseVersion());
168+
logger.info("Oracle-Version: {}", new DefaultDatabaseInformation().getOracleVersion(conn));
176169

177170
reporterFactory = ReporterFactoryProvider.createReporterFactory(compatibilityProxy);
178171

@@ -208,6 +201,8 @@ public int run() {
208201
.includeObjects(finalIncludeObjectsList)
209202
.excludeObjects(finalExcludeObjectsList);
210203

204+
logger.info("Running tests now.");
205+
logger.info("--------------------------------------");
211206
testRunner.run(conn);
212207
} catch (SomeTestsFailedException e) {
213208
returnCode[0] = this.failureExitCode;
@@ -223,6 +218,10 @@ public int run() {
223218

224219
executorService.shutdown();
225220
executorService.awaitTermination(60, TimeUnit.MINUTES);
221+
222+
logger.info("--------------------------------------");
223+
logger.info("All tests done.");
224+
226225
return returnCode[0];
227226
}
228227
catch ( DatabaseNotCompatibleException | UtPLSQLNotInstalledException | DatabaseConnectionFailed e ) {
@@ -239,6 +238,20 @@ public String getCommand() {
239238
}
240239

241240

241+
private void outputMainInformation() {
242+
243+
StringBlockFormatter formatter = new StringBlockFormatter("utPLCSL cli");
244+
formatter.appendLine(CliVersionInfo.getInfo());
245+
formatter.appendLine(JavaApiVersionInfo.getInfo());
246+
formatter.appendLine("Java-Version: " + System.getProperty("java.version"));
247+
formatter.appendLine("ORACLE_HOME: " + EnvironmentVariableUtil.getEnvValue("ORACLE_HOME"));
248+
formatter.appendLine("");
249+
formatter.appendLine("Thanks for testing!");
250+
251+
logger.info(formatter.toString());
252+
logger.info("");
253+
}
254+
242255
/** Returns FileMapperOptions for the first item of a given param list in a baseDir
243256
*
244257
* @param pathParams

0 commit comments

Comments
 (0)