Using new API Compatibility check

pesse · Samuel Nitsche · commit b972be1cc7fe · 2017-11-16T15:27:57.000+01:00
Let CLI exit gracefully when versions not compatible
diff --git a/src/main/java/org/utplsql/cli/Cli.java b/src/main/java/org/utplsql/cli/Cli.java
@@ -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 {
 
@@ -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();
         }
diff --git a/src/main/java/org/utplsql/cli/RunCommand.java b/src/main/java/org/utplsql/cli/RunCommand.java
@@ -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;
@@ -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 " +

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`import com.beust.jcommander.JCommander;`
`4`	`4`	`import com.beust.jcommander.Parameter;`
`5`	`5`	`import com.beust.jcommander.ParameterException;`
	`6`	`+import org.utplsql.api.exception.DatabaseNotCompatibleException;`
`6`	`7`
`7`	`8`	`public class Cli {`
`8`	`9`
`@@ -34,6 +35,8 @@ public static void main(String[] args) {`
`34`	`35`	`} else {`
`35`	`36`	`jc.usage();`
`36`	`37`	`}`
	`38`	`+ } catch ( DatabaseNotCompatibleException e ) {`
	`39`	`+ System.out.println(e.getMessage());`
`37`	`40`	`} catch (Exception e) {`
`38`	`41`	`e.printStackTrace();`
`39`	`42`	`}`