Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Using new API Compatibility check
Let CLI exit gracefully when versions not compatible
  • Loading branch information
pesse authored and Samuel Nitsche committed Nov 16, 2017
commit b972be1cc7fe56b602fc9fa77f445292956b49f8
3 changes: 3 additions & 0 deletions src/main/java/org/utplsql/cli/Cli.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.beust.jcommander.JCommander;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.ParameterException;
import org.utplsql.api.exception.DatabaseNotCompatibleException;

public class Cli {

Expand Down Expand Up @@ -34,6 +35,8 @@ public static void main(String[] args) {
} else {
jc.usage();
}
} catch ( DatabaseNotCompatibleException e ) {
System.out.println(e.getMessage());
} catch (Exception e) {
e.printStackTrace();
}
Expand Down
11 changes: 4 additions & 7 deletions src/main/java/org/utplsql/cli/RunCommand.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
import org.utplsql.api.*;
import org.utplsql.api.compatibility.CompatibilityProxy;
import org.utplsql.api.exception.DatabaseNotCompatibleException;
import org.utplsql.api.exception.SomeTestsFailedException;
import org.utplsql.api.reporter.Reporter;
Expand Down Expand Up @@ -264,14 +265,10 @@ public List<ReporterOptions> getReporterOptionsList() {
*/
private void checkFrameworkCompatibility(Connection conn) throws SQLException {

if ( !skipCompatibilityCheck ) {
try {
DBHelper.failOnVersionCompatibilityCheckFailed(conn);
} catch (DatabaseNotCompatibleException e) {
System.out.println(e.getMessage());
CompatibilityProxy proxy = new CompatibilityProxy(conn, skipCompatibilityCheck);

throw e;
}
if ( !skipCompatibilityCheck ) {
proxy.failOnNotCompatible();
}
else {
System.out.println("Skipping Compatibility check with framework version, expecting the latest version " +
Expand Down