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

Skip to content

Feature/compatibility and ora libs #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pesse merged 8 commits into from
Nov 19, 2017
Merged

Feature/compatibility and ora libs #47

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5401f35
Removed Oracle libaries from release
pesse Nov 10, 2017
c147d5c
Merge remote-tracking branch 'origin/feature/version-check' into bugf…
Nov 12, 2017
22a5603
Only check for orai18n when we are on a 11g database
pesse Nov 12, 2017
f76f9a7
Updated documentation
Nov 12, 2017
610010d
Merge branch 'bugfix/exclude_jdbc_jars' into feature/compatibility_an…
Nov 16, 2017
b972be1
Using new API Compatibility check
pesse Nov 16, 2017
c140c5e
Shutdown cli gracefully when known exceptions occur
pesse Nov 17, 2017
dd0dcdf
Output warning when --failureExitCode is set and framework is not com…
pesse Nov 17, 2017
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
Shutdown cli gracefully when known exceptions occur 
Fixes #44
  • Loading branch information
@pesse
pesse authored and Samuel Nitsche committed Nov 17, 2017
commit c140c5e58e02b90689a91734d926df16586f0dc6
4 changes: 3 additions & 1 deletion src/main/java/org/utplsql/cli/Cli.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import com.beust.jcommander.Parameter;
import com.beust.jcommander.ParameterException;
import org.utplsql.api.exception.DatabaseNotCompatibleException;
import org.utplsql.api.exception.UtPLSQLNotInstalledException;
import org.utplsql.cli.exception.DatabaseConnectionFailed;

public class Cli {

Expand Down Expand Up @@ -35,7 +37,7 @@ public static void main(String[] args) {
} else {
jc.usage();
}
} catch ( DatabaseNotCompatibleException e ) {
} catch ( DatabaseNotCompatibleException | UtPLSQLNotInstalledException | DatabaseConnectionFailed e ) {
System.out.println(e.getMessage());
} catch (Exception e) {
e.printStackTrace();
Expand Down
9 changes: 7 additions & 2 deletions src/main/java/org/utplsql/cli/RunCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import org.utplsql.api.exception.SomeTestsFailedException;
import org.utplsql.api.reporter.Reporter;
import org.utplsql.api.reporter.ReporterFactory;
import org.utplsql.cli.exception.DatabaseConnectionFailed;

import java.io.File;
import java.io.FileNotFoundException;
Expand Down Expand Up @@ -120,8 +121,12 @@ public int run() throws Exception {
reporterList = initReporters(conn, reporterOptionsList);

} catch (SQLException e) {
System.out.println(e.getMessage());
return Cli.DEFAULT_ERROR_CODE;
if ( e.getErrorCode() == 1017 || e.getErrorCode() == 12514 ) {
throw new DatabaseConnectionFailed(e);
}
else {
throw e;
}
}

ExecutorService executorService = Executors.newFixedThreadPool(1 + reporterList.size());
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/org/utplsql/cli/exception/DatabaseConnectionFailed.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package org.utplsql.cli.exception;

import java.sql.SQLException;

public class DatabaseConnectionFailed extends SQLException {

public DatabaseConnectionFailed(SQLException cause ) {
super( "Could not establish connection to database. Reason: " + cause.getMessage(), cause);
}
}