Merge pull request utPLSQL#32 from utPLSQL/feature/inspect_existance_of_utPLSQL

pesse · web-flow · commit 8add8b104859 · 2017-11-17T10:27:54.000+01:00
Introduce special Exception for when utPLSQL is not installed
diff --git a/src/main/java/org/utplsql/api/DBHelper.java b/src/main/java/org/utplsql/api/DBHelper.java
@@ -2,6 +2,7 @@
 
 import oracle.jdbc.OracleTypes;
 import org.utplsql.api.exception.DatabaseNotCompatibleException;
+import org.utplsql.api.exception.UtPLSQLNotInstalledException;
 
 import java.sql.*;
 
@@ -67,6 +68,11 @@ public static Version getDatabaseFrameworkVersion( Connection conn )
                 result = new Version(rs.getString(1));
 
             rs.close();
+        } catch ( SQLException e ) {
+            if ( e.getErrorCode() == UtPLSQLNotInstalledException.ERROR_CODE )
+                throw new UtPLSQLNotInstalledException(e);
+            else
+                throw e;
         }
 
         return result;
diff --git a/src/main/java/org/utplsql/api/TestRunner.java b/src/main/java/org/utplsql/api/TestRunner.java
@@ -4,6 +4,7 @@
 import org.utplsql.api.compatibility.CompatibilityProxy;
 import org.utplsql.api.exception.DatabaseNotCompatibleException;
 import org.utplsql.api.exception.SomeTestsFailedException;
+import org.utplsql.api.exception.UtPLSQLNotInstalledException;
 import org.utplsql.api.reporter.DocumentationReporter;
 import org.utplsql.api.reporter.Reporter;
 import org.utplsql.api.testRunner.TestRunnerStatement;
@@ -84,7 +85,7 @@ public TestRunner skipCompatibilityCheck( boolean skipCompatibilityCheck )
         return this;
     }
 
-    public void run(Connection conn) throws SomeTestsFailedException, SQLException, DatabaseNotCompatibleException {
+    public void run(Connection conn) throws SomeTestsFailedException, SQLException, DatabaseNotCompatibleException, UtPLSQLNotInstalledException {
 
         CompatibilityProxy compatibilityProxy = new CompatibilityProxy(conn, options.skipCompatibilityCheck);
 
@@ -113,7 +114,11 @@ public void run(Connection conn) throws SomeTestsFailedException, SQLException,
         } catch (SQLException e) {
             if (e.getErrorCode() == SomeTestsFailedException.ERROR_CODE) {
                 throw new SomeTestsFailedException(e.getMessage(), e);
-            } else {
+            }
+            else if (e.getErrorCode() == UtPLSQLNotInstalledException.ERROR_CODE) {
+                throw new UtPLSQLNotInstalledException(e);
+            }
+            else {
                 // If the execution failed by unexpected reasons finishes all reporters,
                 // this way the users don't need to care about reporters' sessions hanging.
                 OracleConnection oraConn = conn.unwrap(OracleConnection.class);
diff --git a/src/main/java/org/utplsql/api/exception/UtPLSQLNotInstalledException.java b/src/main/java/org/utplsql/api/exception/UtPLSQLNotInstalledException.java
@@ -0,0 +1,16 @@
+package org.utplsql.api.exception;
+
+import java.sql.SQLException;
+
+/** Exception to track when utPLSQL framework is not installed or accessible on the used database
+ *
+ * @author pesse
+ */
+public class UtPLSQLNotInstalledException extends SQLException {
+
+    public static final int ERROR_CODE = 904;
+
+    public UtPLSQLNotInstalledException( SQLException cause ) {
+        super("utPLSQL framework is not installed on your database or not accessable to the user you are connected with", cause);
+    }
+}
